diff --git a/Gemfile b/Gemfile index ba360ff..628327e 100644 --- a/Gemfile +++ b/Gemfile @@ -19,5 +19,5 @@ if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' gem 'rake', '~> 10.0' else # rubocop requires ruby >= 1.9 - gem 'rubocop' + gem 'rubocop', '<= 0.50.0' end diff --git a/Jenkinsfile b/Jenkinsfile index f15ae16..f40a842 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage('pulling master before adding files') { steps { - sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { + sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" git config user.email jenkins@confdroid.com git pull origin master @@ -24,7 +24,7 @@ pipeline { stage('puppet-lint tests') { steps { - sh '''find . -iname *.pp -exec puppet-lint \\ + sh '''find . -iname *.pp -exec /var/lib/jenkins/bin/puppet-lint \\ --no-class_inherits_from_params_class-check \\ --no-variable_scope-check \\ --no-80chars-check \\ @@ -97,7 +97,7 @@ Changelog of Git Changelog. {{#commits}} -{{hash}} {{authorName}} {{commitTime}} +{{hash}} {{authorName}} {{commitTime}}

{{{messageTitle}}}

@@ -130,7 +130,7 @@ Changelog of Git Changelog. {{/hasIssue}} {{#commits}} -[https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}} +[https://gitlab.confdroid.com/12WW1160/git-changelog-lib/commit/{{hash}} {{hash}}] {{authorName}} {{commitTime}} \'\'\'{{{messageTitle}}}\'\'\' @@ -207,7 +207,7 @@ Changelog of Git Changelog. stage('recommit changes to repo') { steps { - sshagent(['0c22dc63-2ae0-4ad5-98e0-65aa0f0f411g']) { + sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) { sh '''git config user.name "Jenkins Server" git config user.email jenkins@confdroid.com echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"` diff --git a/README.md b/README.md index 3007027..7a8bfb8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.9 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.9 | [![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=cd_nagios)](https://pipelines.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. @@ -13,7 +13,7 @@ Nagios is a powerful open source software solution for monitoring your IT enviro ### Table of Contents * [Features](#features) -* [Repo Structure](https://gitlab.puppetsoft.com/12WW1160/cd_nagios/blob/master/REPOSTRUCTURE.md) +* [Repo Structure](https://gitlab.confdroid.com/12WW1160/cd_nagios/blob/master/REPOSTRUCTURE.md) * [Dependencies](#dependencies) * [Deployment](#deployment) * [native Puppet deployment](#native-puppet-deployment) @@ -30,7 +30,7 @@ Nagios is a powerful open source software solution for monitoring your IT enviro * [Known Problems](#known-problems) * [Support](#support) * [Tests](#tests) -* [Changelog](https://gitlab.puppetsoft.com/12WW1160/cd_nagios/blob/master/CHANGELOG.md) +* [Changelog](https://gitlab.confdroid.com/12WW1160/cd_nagios/blob/master/CHANGELOG.md) * [Contact Us](https://confdroid.com/contact/) * [Disclaimer](#disclaimer) @@ -86,14 +86,14 @@ Repostructure has moved to REPOSTRUCTURE.md in repo. ### Dependencies All dependencies must be included in the catalogue. -* [cd_resources](https://gitlab.puppetsoft.com/12WW1160/cd_resources) for Yum repos. -* [cd_apache](https://gitlab.puppetsoft.com/12WW1160/cd_apache) for installing httpd -* [cd_firewall](https://gitlab.puppetsoft.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) (optional) -* [cd_selinux](https://gitlab.puppetsoft.com/12WW1160/cd_selinux) for selinux policy adjustments -* [cd_certbot](https://gitlab.puppetsoft.com/12WW1160/cd_certbot) to auto-manage TLS certificates (optional) -* [cd_nrpe](https://gitlab.puppetsoft.com/12WW1160/cd_nrpe) to manage NRPE (optional) -* [cd_stdlib](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat -* [cd-concat](https://gitlab.puppetsoft.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) to concatenate configuration files from different sources. +* [cd_resources](https://gitlab.confdroid.com/12WW1160/cd_resources) for Yum repos. +* [cd_apache](https://gitlab.confdroid.com/12WW1160/cd_apache) for installing httpd +* [cd_firewall](https://gitlab.confdroid.com/12WW1160/cd_firewall) or [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) (optional) +* [cd_selinux](https://gitlab.confdroid.com/12WW1160/cd_selinux) for selinux policy adjustments +* [cd_certbot](https://gitlab.confdroid.com/12WW1160/cd_certbot) to auto-manage TLS certificates (optional) +* [cd_nrpe](https://gitlab.confdroid.com/12WW1160/cd_nrpe) to manage NRPE (optional) +* [cd_stdlib](https://gitlab.confdroid.com/12WW1160/cd_stdlib) or [puppetlabs stdlib](https://github.com/puppetlabs/puppetlabs-stdlib) to facilitate concat +* [cd-concat](https://gitlab.confdroid.com/12WW1160/cd_stdlib) or [puppetlabs concat](https://github.com/puppetlabs/puppetlabs-concat) to concatenate configuration files from different sources. ### Deployment @@ -124,13 +124,13 @@ The following parameters must be set to make the module logic work properly: #### Optional Parameters * `$ng_include_nrpe` : Whether to include NRPE as means for the Nagios server to connect to clients. Defaults to `true`. -* `$ng_include_fw` : Whether to include firewall management. Requires [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) or [cd_firewall](https://gitlab.puppetsoft.com/12WW1160/cd_firewall), which is a backdated clone of the puppetlabs firewall but tested to be fully functioning with all our features. +* `$ng_include_fw` : Whether to include firewall management. Requires [puppetlabs firewall](https://github.com/puppetlabs/puppetlabs-firewall) or [cd_firewall](https://gitlab.confdroid.com/12WW1160/cd_firewall), which is a backdated clone of the puppetlabs firewall but tested to be fully functioning with all our features. See the [full list of all available parameters](https://confdroid.com/2017/07/cd_nagios-parameters/). ### PuppetDB -A working instance of PuppetDBconnected to the Puppet master is required for this to work. Installation and configuration of PuppetDB is out of scope for this module, however [cd_puppetdb](https://gitlab.puppetsoft.com/12WW1160/cd_puppetdb) is available to automate this task for you as well within a few minutes. +A working instance of PuppetDBconnected to the Puppet master is required for this to work. Installation and configuration of PuppetDB is out of scope for this module, however [cd_puppetdb](https://gitlab.confdroid.com/12WW1160/cd_puppetdb) is available to automate this task for you as well within a few minutes. ### SELINUX All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.