From 7dd65e515c82ad29cc7ae3536ebe63fa0d25d5bc Mon Sep 17 00:00:00 2001
From: Arne Teuke
Date: Thu, 12 Apr 2018 12:13:28 +0200
Subject: [PATCH 1/2] added development branch
---
Gemfile | 2 +-
Jenkinsfile | 10 +++++-----
README.md | 26 +++++++++++++-------------
3 files changed, 19 insertions(+), 19 deletions(-)
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 | [](https://jenkins.confdroid.com/job/cd_nagios/)|
+|`cd_nagios`| 0.0.1.9 | [](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.
From cabaddfa1be2932aa4ecf9b1f43ddd0a61a0eaec Mon Sep 17 00:00:00 2001
From: Jenkins ConfDroid
Date: Thu, 12 Apr 2018 12:15:02 +0200
Subject: [PATCH 2/2] recommit for updates in build 1
---
CHANGELOG.md | 516 +++++++++---------
REPOSTRUCTURE.md | 137 -----
doc/_index.html | 8 +-
doc/css/style.css | 7 +
doc/file.README.html | 37 +-
doc/frames.html | 2 +-
doc/index.html | 37 +-
doc/puppet_classes/cd_nagios.html | 6 +-
.../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 6 +-
.../cd_nagios_3A_3Aclient_3A_3Atarget.html | 6 +-
...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 6 +-
.../cd_nagios_3A_3Amain_3A_3Aconfig.html | 6 +-
.../cd_nagios_3A_3Amain_3A_3Adirs.html | 6 +-
.../cd_nagios_3A_3Amain_3A_3Ainstall.html | 6 +-
.../cd_nagios_3A_3Amain_3A_3Auser.html | 6 +-
...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 6 +-
...Aobjects_3A_3Aadd_contactgroups_rules.html | 6 +-
...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 6 +-
...3Aobjects_3A_3Aadd_servicegroup_rules.html | 6 +-
...A_3Aobjects_3A_3Aadd_timeperiod_rules.html | 6 +-
...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 6 +-
..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 6 +-
...agios_3A_3Aobjects_3A_3Acontactgroups.html | 6 +-
...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 6 +-
...3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | 6 +-
...agios_3A_3Aobjects_3A_3Aservicegroups.html | 6 +-
...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 6 +-
...Anagios_3A_3Aobjects_3A_3Atimeperiods.html | 6 +-
doc/puppet_classes/cd_nagios_3A_3Aparams.html | 6 +-
.../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 6 +-
..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 6 +-
.../cd_nagios_3A_3Aserver_3A_3Afiles.html | 6 +-
.../cd_nagios_3A_3Aserver_3A_3Aservice.html | 6 +-
...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 6 +-
...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 6 +-
...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 6 +-
...s_3A_3Aobjects_3A_3Aadd_servicegroups.html | 6 +-
...ios_3A_3Aobjects_3A_3Aadd_timeperiods.html | 6 +-
..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 6 +-
.../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 6 +-
doc/top-level-namespace.html | 6 +-
tests/UTF_Files | 3 +-
42 files changed, 378 insertions(+), 573 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e4fcb8..b95233f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,37 +8,47 @@ Changelog of Git Changelog.
No issue
-de4abfbdcd64cff Arne Teuke 2017-09-27 12:30:48
+8574fbd5f27d160 Arne Teuke 2017-09-27 12:42:23
+
+
fixed typo
+
+
+Documentation by YARD 0.9.9
+
Documentation by YARD 0.9.12
Alphabetic Index
@@ -281,9 +281,7 @@
diff --git a/doc/css/style.css b/doc/css/style.css
index f682a69..57e8f9d 100644
--- a/doc/css/style.css
+++ b/doc/css/style.css
@@ -484,6 +484,13 @@ pre.code .rubyid_backref,
pre.code .rubyid_nth_ref { color: #6D79DE; }
pre.code .regexp, .dregexp { color: #036A07; }
pre.code a { border-bottom: 1px dotted #bbf; }
+/* inline code */
+p > code {
+ padding: 1px 3px 1px 3px;
+ border: 1px solid #E1E1E8;
+ background: #F7F7F9;
+ border-radius: 4px;
+}
/* Color fix for links */
#content .summary_desc pre.code .id > .object_link a, /* identifier */
diff --git a/doc/file.README.html b/doc/file.README.html
index 94e5f4b..519916a 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -6,7 +6,7 @@
File: README
- — Documentation by YARD 0.9.9
+ — Documentation by YARD 0.9.12
@@ -62,7 +62,7 @@
Status|
|---|---|---|---|
|
cd_nagios| 0.0.1.9 |
{Build
+href="https://pipelines.confdroid.com/buildStatus/icon?job=cd_nagios">{Build
Status/]|
Synopsis
@@ -89,7 +89,7 @@ production!!! __**
Features
Repo
+href="https://gitlab.confdroid.com/12WW1160/cd_nagios/blob/master/REPOSTRUCTURE.md">Repo
Structure
Dependencies
@@ -125,7 +125,7 @@ Structure
Tests
Changelog
+href="https://gitlab.confdroid.com/12WW1160/cd_nagios/blob/master/CHANGELOG.md">Changelog
Contact Us
@@ -212,31 +212,30 @@ clients:
All dependencies must be included in the catalogue.
@@ -288,7 +287,7 @@ Nagios server to connect to clients. Defaults to true.
Requires puppetlabs
firewall or cd_firewall,
+href="https://gitlab.confdroid.com/12WW1160/cd_firewall">cd_firewall,
which is a backdated clone of the puppetlabs firewall but tested to be
fully functioning with all our features.
@@ -301,8 +300,8 @@ list of all available parameters.
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
-is available to automate this task for you as well within a few minutes.
+href="https://gitlab.confdroid.com/12WW1160/cd_puppetdb">cd_puppetdb is
+available to automate this task for you as well within a few minutes.
SELINUX
@@ -404,9 +403,7 @@ environments.
diff --git a/doc/frames.html b/doc/frames.html
index 0cb1371..42ca6b6 100644
--- a/doc/frames.html
+++ b/doc/frames.html
@@ -2,7 +2,7 @@