recommit for updates in build 56

CHANGELOG.md

@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 <h2> No issue </h2>
 
 
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/b58dd8426596bdc">b58dd8426596bdc</a> Jenkins Server <i>2017-07-23 10:18:44</i>
+<p>
+<h3>recommit for updates in build 54</h3>
+
+</p>
+<a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/98711530f982aa2">98711530f982aa2</a> Arne Teuke <i>2017-07-23 10:18:25</i>
+<p>
+<h3>cert creation works</h3>
+
+</p>
 <a href="https://gitlab.puppetsoft.com/12WW1160/git-changelog-lib/commit/9547dbb7a7e32d0">9547dbb7a7e32d0</a> Jenkins Server <i>2017-07-23 10:08:29</i>
 <p>
 <h3>recommit for updates in build 53</h3>

REPOSTRUCTURE.md

@@ -62,6 +62,7 @@
 |   |   |-- forward_conf.erb
 |   |   |-- index_html.erb
 |   |   |-- nagios_conf.erb
+|   |   |-- nagios_ssl_vhost.erb
 |   |   `-- welcome_conf.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
@@ -79,4 +80,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-18 directories, 61 files
+18 directories, 62 files

doc/_index.html

@@ -186,7 +186,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:38 2017 by
+  Generated on Sun Jul 23 12:58:32 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>

doc/file.README.html

@@ -110,6 +110,8 @@ Structure</a></p>
 </li><li>
 <p><a href="#selinux">SELINUX</a></p>
 </li><li>
+<p><a href="#certbot">Certbot</a></p>
+</li><li>
 <p><a href="#known-problems">Known Problems</a></p>
 </li><li>
 <p><a href="#support">Support</a></p>
@@ -249,6 +251,26 @@ is available to automate this task for you as well within a few minutes.</p>
 <p>All files and directories are configured with correct selinux context. If
 selinux is disabled, these contexts are ignored.</p>
 
+<h3 id="label-Certbot">Certbot</h3>
+
+<p>This module can optionally setup <a
+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
+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.</p>
+
+<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
+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.</p>
+
 <h3 id="label-Known+Problems">Known Problems</h3>
 
 <h3 id="label-Support">Support</h3>
@@ -304,7 +326,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:40 2017 by
+  Generated on Sun Jul 23 12:58:33 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>

doc/index.html

@@ -110,6 +110,8 @@ Structure</a></p>
 </li><li>
 <p><a href="#selinux">SELINUX</a></p>
 </li><li>
+<p><a href="#certbot">Certbot</a></p>
+</li><li>
 <p><a href="#known-problems">Known Problems</a></p>
 </li><li>
 <p><a href="#support">Support</a></p>
@@ -249,6 +251,26 @@ is available to automate this task for you as well within a few minutes.</p>
 <p>All files and directories are configured with correct selinux context. If
 selinux is disabled, these contexts are ignored.</p>
 
+<h3 id="label-Certbot">Certbot</h3>
+
+<p>This module can optionally setup <a
+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
+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.</p>
+
+<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
+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.</p>
+
 <h3 id="label-Known+Problems">Known Problems</h3>
 
 <h3 id="label-Support">Support</h3>
@@ -304,7 +326,7 @@ environments.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:39 2017 by
+  Generated on Sun Jul 23 12:58:33 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>

doc/puppet_classes/cd_nagios.html

@@ -139,7 +139,7 @@ class cd_nagios {
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:40 2017 by
+  Generated on Sun Jul 23 12:58:33 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>

doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html

@@ -230,7 +230,7 @@ class cd_nagios::certbot::certs (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html

@@ -368,7 +368,7 @@ class cd_nagios::client::target (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:42 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html

@@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:42 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html

@@ -168,15 +168,15 @@ class cd_nagios::main::config (
   # manage server configuration
 
   if $::fqdn == $ng_nagios_server {
-#    include cd_nagios::server::service
+    include cd_nagios::server::service
 
     if $ng_include_fw == true {
       include cd_nagios::firewall::iptables
     }
 
-#    if $ng_use_selinux_tools == true {
+    if $ng_use_selinux_tools == true {
-#      include cd_nagios::selinux::config
+      include cd_nagios::selinux::config
-#    }
+    }
 
     if $ng_enable_certbot == true {
       require cd_nagios::certbot::certs
@@ -195,7 +195,7 @@ class cd_nagios::main::config (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html

@@ -468,7 +468,7 @@ class cd_nagios::main::dirs (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:34 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html

@@ -235,7 +235,7 @@ class cd_nagios::main::install (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html

@@ -200,7 +200,7 @@ class cd_nagios::main::user (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Aparams.html

@@ -2169,7 +2169,9 @@ required for certbot and used in the web templates.</p>
 392
 393
 394
-395</pre>
+395
+396
+397</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 216</span>
@@ -2342,6 +2344,8 @@ $ng_unless_get_cert   = &#39;cd_nagios/certbot/unless_get_cert.erb&#39;
 $ng_unless_renew_erb  = &#39;cd_nagios/certbot/unless_renew_cert.erb&#39;
 $ng_index_html_file   = &#39;/var/www/html/index.html&#39;
 $ng_index_html_erb    = &#39;cd_nagios/httpd/index_html.erb&#39;
+$ng_ssl_vhost_file    = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
+$ng_ssl_vhost_erb     = &#39;cd_nagios/httpd/nagios_ssl_vhost.erb&#39;
 
 # certbot
 $ng_certbot_main_dir  = &#39;/etc/letsencrypt&#39;
@@ -2361,7 +2365,7 @@ $ng_certbot_cert      = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.p
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:34 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>

doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html

@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:42 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html

@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:42 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html

@@ -230,7 +230,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 121
 122
 123
-124</pre>
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 23</span>
@@ -300,12 +315,11 @@ class cd_nagios::server::files (
       notify    =&gt;  Service[$ae_service],
     }
 
+    if $ng_use_https == true {
 
-    if $ng_http_https_fw == true {
+      file { $ng_ssl_vhost_file:
-
-      file { $ng_forward_conf:
         ensure    =&gt;  file,
-        path      =&gt;  $ng_forward_conf,
+        path      =&gt;  $ng_ssl_vhost_file,
         owner     =&gt;  &#39;root&#39;,
         group     =&gt;  &#39;root&#39;,
         mode      =&gt;  &#39;0644&#39;,
@@ -313,11 +327,27 @@ class cd_nagios::server::files (
         selrole   =&gt;  object_r,
         seltype   =&gt;  httpd_config_t,
         seluser   =&gt;  system_u,
-        content   =&gt;  template($ng_forward_conf_erb),
+        content   =&gt;  template($ng_ssl_vhost_erb),
         notify    =&gt;  Service[$ae_service],
       }
-    }
 
+      if $ng_http_https_fw == true {
+
+        file { $ng_forward_conf:
+          ensure    =&gt;  file,
+          path      =&gt;  $ng_forward_conf,
+          owner     =&gt;  &#39;root&#39;,
+          group     =&gt;  &#39;root&#39;,
+          mode      =&gt;  &#39;0644&#39;,
+          selrange  =&gt;  s0,
+          selrole   =&gt;  object_r,
+          seltype   =&gt;  httpd_config_t,
+          seluser   =&gt;  system_u,
+          content   =&gt;  template($ng_forward_conf_erb),
+          notify    =&gt;  Service[$ae_service],
+        }
+      }
+    }
 
     if $ng_enable_index == true {
 
@@ -344,7 +374,7 @@ class cd_nagios::server::files (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:41 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html

@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:42 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html

@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:42 2017 by
+  Generated on Sun Jul 23 12:58:35 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>

doc/top-level-namespace.html

@@ -90,7 +90,7 @@
 </div>
 
       <div id="footer">
-  Generated on Sun Jul 23 12:18:40 2017 by
+  Generated on Sun Jul 23 12:58:33 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>