confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !15
This commit is contained in:
12ww1160
2017-07-21 16:33:24 +02:00
parent 9ec22aa047 353e7e99cf
commit 78f105660d
24 changed files with 142 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
CHANGELOG.md
View File

@@ -8,105 +8,45 @@ Changelog of Git Changelog.
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/4d4f5636b803d9e">4d4f5636b803d9e</a> Jenkins Server <i>2017-07-21 14:34:25</i>
<p>
<h3>recommit for updates in build 30</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2543121abaf145b">2543121abaf145b</a> Arne Teuke <i>2017-07-21 14:33:05</i>
<p>
<h3>added certbot section</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/60407116a503868">60407116a503868</a> Jenkins Server <i>2017-07-21 13:47:34</i>
<p>
<h3>recommit for updates in build 27</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/409ec084543f0d8">409ec084543f0d8</a> Arne Teuke <i>2017-07-21 13:47:12</i>
<p>
<h3>added control for forward.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/1fc9ffeacdebd20">1fc9ffeacdebd20</a> Jenkins Server <i>2017-07-21 13:43:26</i>
<p>
<h3>recommit for updates in build 26</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d9863d874f0b88f">d9863d874f0b88f</a> Arne Teuke <i>2017-07-21 13:43:07</i>
<p>
<h3>added control for forward.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/00ef7138b378bf5">00ef7138b378bf5</a> Jenkins Server <i>2017-07-21 13:06:15</i>
<p>
<h3>recommit for updates in build 25</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/46d3b02f7625b15">46d3b02f7625b15</a> Arne Teuke <i>2017-07-21 13:05:55</i>
<p>
<h3>added control for welcome.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/4ec7633f976a225">4ec7633f976a225</a> Jenkins Server <i>2017-07-21 12:51:33</i>
<p>
<h3>recommit for updates in build 24</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5d12bf44374b934">5d12bf44374b934</a> Arne Teuke <i>2017-07-21 12:51:07</i>
<p>
<h3>found format options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/442fd08f623728f">442fd08f623728f</a> Arne Teuke <i>2017-07-21 12:44:03</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b95350b8d8e58b4">b95350b8d8e58b4</a> Arne Teuke <i>2017-07-21 12:41:33</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a28f890bdde57e2">a28f890bdde57e2</a> Arne Teuke <i>2017-07-21 12:30:09</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/de3a7fd4fa01415">de3a7fd4fa01415</a> Arne Teuke <i>2017-07-21 12:20:44</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b37864c7a366aff">b37864c7a366aff</a> Arne Teuke <i>2017-07-21 12:15:47</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/109eea2716be3ae">109eea2716be3ae</a> Jenkins Server <i>2017-07-21 11:35:04</i>
<p>
<h3>recommit for updates in build 18</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5de81e818498830">5de81e818498830</a> Arne Teuke <i>2017-07-21 11:34:48</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/41434c9607ab037">41434c9607ab037</a> Arne Teuke <i>2017-07-21 11:28:50</i>
<p>
<h3>adding options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/544f48d800ad39a">544f48d800ad39a</a> Arne Teuke <i>2017-07-21 11:21:12</i>
<p>
<h3>adding options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/969e377d5db6423">969e377d5db6423</a> Jenkins Server <i>2017-07-21 11:06:59</i>
<p>
<h3>recommit for updates in build 15</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e402224ff9bb367">e402224ff9bb367</a> Arne Teuke <i>2017-07-21 11:06:36</i>
<p>
<h3>trying empty array</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/49551a3d9af3460">49551a3d9af3460</a> Arne Teuke <i>2017-07-21 10:43:06</i>
<p>
<h3>included control for nagios.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/05036af24182601">05036af24182601</a> Jenkins Server <i>2017-07-20 16:26:40</i>
<p>
@@ -144,6 +84,91 @@ Changelog of Git Changelog.
</p>
<h2> v0.0.0.8 </h2>
<h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e160b3f919967bc">e160b3f919967bc</a> Arne Teuke <i>2017-07-21 14:03:09</i>
<p>
<h3>finished nagios.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5311e868eec2343">5311e868eec2343</a> Arne Teuke <i>2017-07-21 13:57:05</i>
<p>
<h3>chenged forwarding to allow http as well too</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/409ec084543f0d8">409ec084543f0d8</a> Arne Teuke <i>2017-07-21 13:47:12</i>
<p>
<h3>added control for forward.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d9863d874f0b88f">d9863d874f0b88f</a> Arne Teuke <i>2017-07-21 13:43:07</i>
<p>
<h3>added control for forward.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/46d3b02f7625b15">46d3b02f7625b15</a> Arne Teuke <i>2017-07-21 13:05:55</i>
<p>
<h3>added control for welcome.conf</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5d12bf44374b934">5d12bf44374b934</a> Arne Teuke <i>2017-07-21 12:51:07</i>
<p>
<h3>found format options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/442fd08f623728f">442fd08f623728f</a> Arne Teuke <i>2017-07-21 12:44:03</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b95350b8d8e58b4">b95350b8d8e58b4</a> Arne Teuke <i>2017-07-21 12:41:33</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/a28f890bdde57e2">a28f890bdde57e2</a> Arne Teuke <i>2017-07-21 12:30:09</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/de3a7fd4fa01415">de3a7fd4fa01415</a> Arne Teuke <i>2017-07-21 12:20:44</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b37864c7a366aff">b37864c7a366aff</a> Arne Teuke <i>2017-07-21 12:15:47</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/5de81e818498830">5de81e818498830</a> Arne Teuke <i>2017-07-21 11:34:48</i>
<p>
<h3>testing options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/41434c9607ab037">41434c9607ab037</a> Arne Teuke <i>2017-07-21 11:28:50</i>
<p>
<h3>adding options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/544f48d800ad39a">544f48d800ad39a</a> Arne Teuke <i>2017-07-21 11:21:12</i>
<p>
<h3>adding options both for hosts and ips</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/e402224ff9bb367">e402224ff9bb367</a> Arne Teuke <i>2017-07-21 11:06:36</i>
<p>
<h3>trying empty array</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/49551a3d9af3460">49551a3d9af3460</a> Arne Teuke <i>2017-07-21 10:43:06</i>
<p>
<h3>included control for nagios.conf</h3>
</p>
<h2> v0.0.0.7 </h2>
<h2> No issue </h2>

1
README.md
View File

@@ -47,6 +47,7 @@ Configuration
* configure firewall (optional)
* configure selinux policies (optional)
* configure forwarding http to https including accesing the /nagios url directly (optional)
* manage TLS certificates through certbot (optional)
Service
* manage Nagios service on server

3
REPOSTRUCTURE.md
View File

@@ -9,6 +9,7 @@
| | |-- full_list.js
| | `-- jquery.js
| |-- puppet_classes
| | |-- cd_nagios_3A_3Acertbot_3A_3Aconfig.html
| | |-- cd_nagios_3A_3Aclient_3A_3Atarget.html
| | |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html
| | |-- cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -75,4 +76,4 @@
|-- README.md
`-- REPOSTRUCTURE.md
18 directories, 57 files
18 directories, 58 files

2
doc/_index.html
View File

@@ -186,7 +186,7 @@
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:18 2017 by
Generated on Fri Jul 21 16:42:20 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

6
doc/file.README.html
View File

@@ -145,7 +145,9 @@ configure NRPE on clients (optional)
*
configure selinux policies (optional)
* configure forwarding http to https
including accesing the /nagios url directly (optional)</p>
including accesing the /nagios url directly (optional)
* manage TLS
certificates through certbot (optional)</p>
<p>Service
* manage Nagios service on server
@@ -302,7 +304,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Fri Jul 21 16:34:19 2017 by
Generated on Fri Jul 21 16:42:22 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

6
doc/index.html
View File

@@ -145,7 +145,9 @@ configure NRPE on clients (optional)
*
configure selinux policies (optional)
* configure forwarding http to https
including accesing the /nagios url directly (optional)</p>
including accesing the /nagios url directly (optional)
* manage TLS
certificates through certbot (optional)</p>
<p>Service
* manage Nagios service on server
@@ -302,7 +304,7 @@ environments.</p>
</div></div>
<div id="footer">
Generated on Fri Jul 21 16:34:18 2017 by
Generated on Fri Jul 21 16:42:21 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios.html
View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:19 2017 by
Generated on Fri Jul 21 16:42:22 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

4
doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html
View File

@@ -186,7 +186,7 @@ class cd_nagios::certbot::config (
unless =&gt; template(&#39;cd_nagios/certbot/unless_get_cert.erb&#39;),
notify =&gt; Service[&#39;httpd&#39;],
creates =&gt; &#39;/etc/httpd/conf.d/.cert_created&#39;,
}
}
# renew certs
@@ -208,7 +208,7 @@ class cd_nagios::certbot::config (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html
View File

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html
View File

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

14
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
View File

@@ -152,7 +152,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
43
44
45
46</pre>
46
47
48
49
50
51</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 24</span>
@@ -173,6 +178,11 @@ class cd_nagios::main::config (
if $ng_use_selinux_tools == true {
include cd_nagios::selinux::config
}
if $ng_enable_certbot == true {
include cd_nagios::certbot::config
}
}
if $::fqdn != $ng_nagios_server {
@@ -187,7 +197,7 @@ class cd_nagios::main::config (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html
View File

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:23 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html
View File

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html
View File

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Aparams.html
View File

@@ -2305,7 +2305,7 @@ $ng_forward_conf_erb = &#39;cd_nagios/httpd/forward_conf.erb&#39;
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:20 2017 by
Generated on Fri Jul 21 16:42:23 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
View File

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
View File

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:25 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
View File

@@ -300,7 +300,7 @@ class cd_nagios::server::files (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
View File

@@ -174,7 +174,7 @@ class cd_nagios::server::service (
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:21 2017 by
Generated on Fri Jul 21 16:42:24 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
View File

@@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:22 2017 by
Generated on Fri Jul 21 16:42:25 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
doc/top-level-namespace.html
View File

@@ -90,7 +90,7 @@
</div>
<div id="footer">
Generated on Fri Jul 21 16:34:19 2017 by
Generated on Fri Jul 21 16:42:22 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0).
</div>

2
manifests/certbot/config.pp
View File

@@ -39,7 +39,7 @@ class cd_nagios::certbot::config (
unless => template('cd_nagios/certbot/unless_get_cert.erb'),
notify => Service['httpd'],
creates => '/etc/httpd/conf.d/.cert_created',
}
}
# renew certs

5
manifests/main/config.pp
View File

@@ -37,6 +37,11 @@ class cd_nagios::main::config (
if $ng_use_selinux_tools == true {
include cd_nagios::selinux::config
}
if $ng_enable_certbot == true {
include cd_nagios::certbot::config
}
}
if $::fqdn != $ng_nagios_server {

4
templates/httpd/nagios_conf.erb
View File

@@ -37,7 +37,7 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/"
Allow from <%= @ng_required_hosts %>
<% end -%>
<% unless @ng_required_ips.empty? -%>
Alloow from <%= @ng_required_ips %>
Allow from <%= @ng_required_ips %>
<% end -%>
AuthName "Nagios Access"
AuthType Basic
@@ -77,7 +77,7 @@ Alias /nagios "/usr/share/nagios/html"
Allow from <%= @ng_required_hosts %>
<% end -%>
<% unless @ng_required_ips.empty? -%>
Alloow from <%= @ng_required_ips %>
Allow from <%= @ng_required_ips %>
<% end -%>
AuthName "Nagios Access"
AuthType Basic