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

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !40
This commit is contained in:
12ww1160
2017-07-23 15:03:54 +02:00
parent 9aaacb664d 0812a3559d
commit 781ff40dda
22 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
<h2> No issue </h2> <h2> No issue </h2>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/f8c596b9bcca053">f8c596b9bcca053</a> Jenkins Server <i>2017-07-23 12:32:43</i>
<p>
<h3>recommit for updates in build 63</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/101aa23b1bbec64">101aa23b1bbec64</a> Arne Teuke <i>2017-07-23 12:32:28</i>
<p>
<h3>changed logic for http vs https and removed index+ welcome file control</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d203cd87815c979">d203cd87815c979</a> Jenkins Server <i>2017-07-23 12:28:46</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/d203cd87815c979">d203cd87815c979</a> Jenkins Server <i>2017-07-23 12:28:46</i>
<p> <p>
<h3>recommit for updates in build 62</h3> <h3>recommit for updates in build 62</h3>

7
README.md
View File

@@ -106,11 +106,12 @@ A working instance of PuppetDBconnected to the Puppet master is required for thi
All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.
### Certbot ### Certbot
This module can optionally setup [certbot](https://certbot.eff.org/) TLS certificate management for the frontend GUI. In order to do so, set `ng_enable_certbot` to true (default). Effectively, this will manage the certs before even installing Nagios, so there will be no problems with the Nagios showing up with a self-signed certificate. This module can optionally setup [certbot](https://certbot.eff.org/) TLS certificate management for the frontend GUI. In order to do so, set `$ng_enable_certbot` as well as `$ng_use_https` to `true` (default). Effectively, this will manage the certs before even installing Nagios, so there will be no problems with the Nagios showing up with a self-signed certificate. Once enabled, the module will go and try to obtain a certificate automatically. For this to work, you need to have proper DNS resolution set up for your domain / nagios server. Certs are also automatically renewed.
Once enabled, the module will go and try to obtain a certificate automatically. For this to work, you need to have proper DNS resolution set up for your domain / nagios server.
If you prefer to use https but use self-signed certs or your own CA, simply set to false. This will point the SSL vhost config file to the default location for TLS certificates.
### httpd vHost files ### httpd vHost files
by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host. by Default, Nagios creates its own nagios.conf file, which is not a vhost file and relies on the main ssd.conf. However, as Nagios might be running on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.
### Known Problems ### Known Problems

2
doc/_index.html
View File

@@ -186,7 +186,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:37 2017 by Generated on Sun Jul 23 15:13:07 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

25
doc/file.README.html
View File

@@ -255,21 +255,26 @@ selinux is disabled, these contexts are ignored.</p>
<p>This module can optionally setup <a <p>This module can optionally setup <a
href="https://certbot.eff.org/">certbot</a> TLS certificate management for href="https://certbot.eff.org/">certbot</a> TLS certificate management for
the frontend GUI. In order to do so, set <code>ng_enable_certbot</code> to the frontend GUI. In order to do so, set <code>$ng_enable_certbot</code> as
true (default). Effectively, this will manage the certs before even well as <code>$ng_use_https</code> to <code>true</code> (default).
installing Nagios, so there will be no problems with the Nagios showing up Effectively, this will manage the certs before even installing Nagios, so
with a self-signed certificate. there will be no problems with the Nagios showing up with a self-signed
Once enabled, the module will go and try to certificate. Once enabled, the module will go and try to obtain a
obtain a certificate automatically. For this to work, you need to have certificate automatically. For this to work, you need to have proper DNS
proper DNS resolution set up for your domain / nagios server.</p> resolution set up for your domain / nagios server. Certs are also
automatically renewed.</p>
<p>If you prefer to use https but use self-signed certs or your own CA, simply
set to false. This will point the SSL vhost config file to the default
location for TLS certificates.</p>
<h3 id="label-httpd+vHost+files">httpd vHost files</h3> <h3 id="label-httpd+vHost+files">httpd vHost files</h3>
<p>by Default, Nagios creates its own nagios.conf file, which is not a vhost <p>by Default, Nagios creates its own nagios.conf file, which is not a vhost
file and relies on the main ssd.conf. However, as Nagios might be running file and relies on the main ssd.conf. However, as Nagios might be running
on a regular web server with various other web instances (not recommended on a regular web server with various other web instances (not recommended
through), we will not want to manage ssl.conf directly, hence the module through for performance reasons), we will not want to manage ssl.conf
creates a vhost for the ssl host.</p> directly, hence the module creates a vhost for the ssl host.</p>
<h3 id="label-Known+Problems">Known Problems</h3> <h3 id="label-Known+Problems">Known Problems</h3>
@@ -326,7 +331,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:38 2017 by Generated on Sun Jul 23 15:13:09 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

25
doc/index.html
View File

@@ -255,21 +255,26 @@ selinux is disabled, these contexts are ignored.</p>
<p>This module can optionally setup <a <p>This module can optionally setup <a
href="https://certbot.eff.org/">certbot</a> TLS certificate management for href="https://certbot.eff.org/">certbot</a> TLS certificate management for
the frontend GUI. In order to do so, set <code>ng_enable_certbot</code> to the frontend GUI. In order to do so, set <code>$ng_enable_certbot</code> as
true (default). Effectively, this will manage the certs before even well as <code>$ng_use_https</code> to <code>true</code> (default).
installing Nagios, so there will be no problems with the Nagios showing up Effectively, this will manage the certs before even installing Nagios, so
with a self-signed certificate. there will be no problems with the Nagios showing up with a self-signed
Once enabled, the module will go and try to certificate. Once enabled, the module will go and try to obtain a
obtain a certificate automatically. For this to work, you need to have certificate automatically. For this to work, you need to have proper DNS
proper DNS resolution set up for your domain / nagios server.</p> resolution set up for your domain / nagios server. Certs are also
automatically renewed.</p>
<p>If you prefer to use https but use self-signed certs or your own CA, simply
set to false. This will point the SSL vhost config file to the default
location for TLS certificates.</p>
<h3 id="label-httpd+vHost+files">httpd vHost files</h3> <h3 id="label-httpd+vHost+files">httpd vHost files</h3>
<p>by Default, Nagios creates its own nagios.conf file, which is not a vhost <p>by Default, Nagios creates its own nagios.conf file, which is not a vhost
file and relies on the main ssd.conf. However, as Nagios might be running file and relies on the main ssd.conf. However, as Nagios might be running
on a regular web server with various other web instances (not recommended on a regular web server with various other web instances (not recommended
through), we will not want to manage ssl.conf directly, hence the module through for performance reasons), we will not want to manage ssl.conf
creates a vhost for the ssl host.</p> directly, hence the module creates a vhost for the ssl host.</p>
<h3 id="label-Known+Problems">Known Problems</h3> <h3 id="label-Known+Problems">Known Problems</h3>
@@ -326,7 +331,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:38 2017 by Generated on Sun Jul 23 15:13:08 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios.html
View File

@@ -139,7 +139,7 @@ class cd_nagios {
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:38 2017 by Generated on Sun Jul 23 15:13:09 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
View File

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:11 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
View File

@@ -195,7 +195,7 @@ class cd_nagios::main::config (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aparams.html
View File

@@ -2356,7 +2356,7 @@ $ng_certbot_live = &quot;${ng_certbot_main_dir}/live&quot;
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:39 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:11 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:11 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

2
doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
View File

@@ -324,7 +324,7 @@ class cd_nagios::server::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:10 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:11 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </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>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:40 2017 by Generated on Sun Jul 23 15:13:11 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

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

@@ -90,7 +90,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 14:32:38 2017 by Generated on Sun Jul 23 15:13:09 2017 by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a> <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
0.9.9 (ruby-2.0.0). 0.9.9 (ruby-2.0.0).
</div> </div>

3
templates/httpd/forward_conf.erb
View File

@@ -1,12 +1,13 @@
<VirtualHost *:<%= @ng_http_port %>> <VirtualHost *:<%= @ng_http_port %>>
ServerAdmin root@localhost ServerAdmin root@localhost
DocumentRoot /var/www/html DocumentRoot /var/www/html
ServerName www.<%= @ng_webserver_name %> ServerName www.<%= @ng_webserver_name %>/nagios
ServerAlias <%= @ng_webserver_name %> ServerAlias <%= @ng_webserver_name %>
<% if @ng_use_https == true -%> <% if @ng_use_https == true -%>
Redirect permanent / https://<%= @ng_webserver_name %>/nagios Redirect permanent / https://<%= @ng_webserver_name %>/nagios
<% end -%> <% end -%>
<% if @ng_use_https != true -%> <% if @ng_use_https != true -%>
ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/" ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/"
<Directory "/usr/lib64/nagios/cgi-bin/"> <Directory "/usr/lib64/nagios/cgi-bin/">

2
templates/httpd/nagios_ssl_vhost.erb
View File

@@ -113,6 +113,8 @@ Alias /nagios "/usr/share/nagios/html"
</IfVersion> </IfVersion>
</Directory> </Directory>
RedirectMatch ^/$ https://<%= @ng_webserver_name %>/nagios
SetEnvIf User-Agent ".*MSIE.*" \ SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \ nokeepalive ssl-unclean-shutdown \