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

Merge branch 'jenkins' into 'master'

Browse Source 
Jenkins

See merge request !36
This commit is contained in:
12ww1160
2017-07-23 13:30:08 +02:00
parent 23a99dc196 9920bc9caa
commit fdf5f4d6fd
22 changed files with 43 additions and 41 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/8085b97daed7ce4">8085b97daed7ce4</a> Jenkins Server <i>2017-07-23 11:28:03</i>
<p>
<h3>recommit for updates in build 59</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/da29fe89ef8469e">da29fe89ef8469e</a> Arne Teuke <i>2017-07-23 11:27:50</i>
<p>
<h3>typos</h3>
</p>
<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2810fd55ebcfd00">2810fd55ebcfd00</a> Jenkins Server <i>2017-07-23 11:22:21</i> <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/2810fd55ebcfd00">2810fd55ebcfd00</a> Jenkins Server <i>2017-07-23 11:22:21</i>
<p> <p>
<h3>recommit for updates in build 58</h3> <h3>recommit for updates in build 58</h3>

2
doc/_index.html
View File

@@ -186,7 +186,7 @@
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 13:27:57 2017 by Generated on Sun Jul 23 13:38:19 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/file.README.html
View File

@@ -326,7 +326,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 13:27:59 2017 by Generated on Sun Jul 23 13:38:20 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/index.html
View File

@@ -326,7 +326,7 @@ environments.</p>
</div></div> </div></div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 13:27:58 2017 by Generated on Sun Jul 23 13:38:19 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 13:27:59 2017 by Generated on Sun Jul 23 13:38:20 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>

4
doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html
View File

@@ -202,7 +202,7 @@ class cd_nagios::certbot::certs (
provider =&gt; &#39;shell&#39;, provider =&gt; &#39;shell&#39;,
unless =&gt; template(&#39;cd_nagios/certbot/unless_get_cert.erb&#39;), unless =&gt; template(&#39;cd_nagios/certbot/unless_get_cert.erb&#39;),
notify =&gt; Service[&#39;httpd&#39;], notify =&gt; Service[&#39;httpd&#39;],
creates =&gt; $ng_certbot_cert, creates =&gt; $ng_certbot_check,
} }
# renew certs # renew certs
@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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 13:28:00 2017 by Generated on Sun Jul 23 13:38:21 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 13:28:00 2017 by Generated on Sun Jul 23 13:38:21 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 13:28:00 2017 by Generated on Sun Jul 23 13:38:21 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 13:28:00 2017 by Generated on Sun Jul 23 13:38:21 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/puppet_classes/cd_nagios_3A_3Aparams.html
View File

@@ -1881,12 +1881,14 @@ certificate management</p>
<li> <li>
<span class='name'>ng_certbot_cert_path</span> <span class='name'>ng_certbot_webroot</span>
<span class='type'>(<tt>string</tt>)</span> <span class='type'>(<tt>string</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/www/html&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -1960,19 +1962,6 @@ required for certbot and used in the web templates.</p>
</li> </li>
<li>
<span class='name'>ng_certbot_webroot</span>
<span class='type'>(<tt>Any</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/var/www/html&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -2171,7 +2160,8 @@ required for certbot and used in the web templates.</p>
394 394
395 395
396 396
397</pre> 397
398</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 216</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 216</span>
@@ -2350,7 +2340,8 @@ $ng_ssl_vhost_erb = &#39;cd_nagios/httpd/nagios_ssl_vhost.erb&#39;
# certbot # certbot
$ng_certbot_main_dir = &#39;/etc/letsencrypt&#39; $ng_certbot_main_dir = &#39;/etc/letsencrypt&#39;
$ng_certbot_archive = &quot;${ng_certbot_main_dir}/archive&quot; $ng_certbot_archive = &quot;${ng_certbot_main_dir}/archive&quot;
$ng_certbot_cert = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.pem&quot; $ng_certbot_check = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.pem&quot;
$ng_certbot_live = &quot;${ng_certbot_main_dir}/live&quot;
# includes must be last # includes must be last
@@ -2365,7 +2356,7 @@ $ng_certbot_cert = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.p
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 13:28:00 2017 by Generated on Sun Jul 23 13:38:21 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 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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

@@ -374,7 +374,7 @@ class cd_nagios::server::files (
</div> </div>
<div id="footer"> <div id="footer">
Generated on Sun Jul 23 13:28:01 2017 by Generated on Sun Jul 23 13:38:21 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 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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 13:28:01 2017 by Generated on Sun Jul 23 13:38:22 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 13:27:59 2017 by Generated on Sun Jul 23 13:38:20 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
manifests/certbot/certs.pp
View File

@@ -44,7 +44,7 @@ class cd_nagios::certbot::certs (
provider => 'shell', provider => 'shell',
unless => template('cd_nagios/certbot/unless_get_cert.erb'), unless => template('cd_nagios/certbot/unless_get_cert.erb'),
notify => Service['httpd'], notify => Service['httpd'],
creates => $ng_certbot_cert, creates => $ng_certbot_check,
} }
# renew certs # renew certs

5
manifests/params.pp
View File

@@ -202,7 +202,7 @@
# If you want no restriction, choose '0.0.0.0/0' # If you want no restriction, choose '0.0.0.0/0'
# @param [boolean] ng_enable_certbot Whether to use certbot for automated TLS # @param [boolean] ng_enable_certbot Whether to use certbot for automated TLS
# certificate management # certificate management
# @param [string] ng_certbot_cert_path the path for certbot to place # @param [string] ng_certbot_webroot the path for certbot to place
# challenges for the certification process. # challenges for the certification process.
# @param [string] ng_mail_user email address to receive administrative mail. # @param [string] ng_mail_user email address to receive administrative mail.
# used for nagios itself as well as for certbot. # used for nagios itself as well as for certbot.
@@ -387,7 +387,8 @@ $ng_ssl_vhost_erb = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
# certbot # certbot
$ng_certbot_main_dir = '/etc/letsencrypt' $ng_certbot_main_dir = '/etc/letsencrypt'
$ng_certbot_archive = "${ng_certbot_main_dir}/archive" $ng_certbot_archive = "${ng_certbot_main_dir}/archive"
$ng_certbot_cert = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem" $ng_certbot_check = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
$ng_certbot_live = "${ng_certbot_main_dir}/live"
# includes must be last # includes must be last

6
templates/httpd/nagios_ssl_vhost.erb
View File

@@ -18,9 +18,9 @@
SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4" SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4"
<% if @ng_enable_certbot == true -%> <% if @ng_enable_certbot == true -%>
SSLCertificateFile <%= @js_certbot_live %>/<%= @ng_webserver_name %>/cert.pem SSLCertificateFile <%= @ng_certbot_live %>/<%= @ng_webserver_name %>/cert.pem
SSLCertificateKeyFile <%= @js_certbot_live %>/<%= @ng_webserver_name %>/privkey.pem SSLCertificateKeyFile <%= @ng_certbot_live %>/<%= @ng_webserver_name %>/privkey.pem
SSLCACertificateFile <%= @js_certbot_live %>/<%= @ng_webserver_name %>/fullchain.pem SSLCACertificateFile <%= @ng_certbot_live %>/<%= @ng_webserver_name %>/fullchain.pem
<% elsif @ng_enable_certbot != true -%> <% elsif @ng_enable_certbot != true -%>
SSLCertificateFile /etc/pki/tls/certs/localhost.crt SSLCertificateFile /etc/pki/tls/certs/localhost.crt
SSLCertificateKeyFile /etc/pki/tls/private/localhost.key SSLCertificateKeyFile /etc/pki/tls/private/localhost.key