Recommit for updates in build 25

doc/_index.html

@@ -108,6 +108,11 @@
       
             </li>
     
+            <li>
+      <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span>
+      
+            </li>
+    
             <li>
       <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span>
       

doc/puppet_class_list.html

@@ -92,7 +92,14 @@
     </li>
     
 
-    <li id="object_puppet_classes::confdroid_nagios::server::service" class="odd">
+    <li id="object_puppet_classes::confdroid_nagios::server::nagios" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::confdroid_nagios::server::service" class="even">
       <div class="item">
         <span class='object_link'><a href="puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span>
       </div>

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -79,6 +79,8 @@
       
       <span class='object_link'><a href="confdroid_nagios_3A_3Aclient_3A_3Atarget.html" title="puppet_classes::confdroid_nagios::client::target (puppet_class)">confdroid_nagios::client::target</a></span><br/>
       
+      <span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Anagios.html" title="puppet_classes::confdroid_nagios::server::nagios (puppet_class)">confdroid_nagios::server::nagios</a></span><br/>
+      
       <span class='object_link'><a href="confdroid_nagios_3A_3Aserver_3A_3Aservice.html" title="puppet_classes::confdroid_nagios::server::service (puppet_class)">confdroid_nagios::server::service</a></span><br/>
       
     </dd>
@@ -305,6 +307,24 @@ inherited by all classes except defines.
         &mdash;
         <div class='inline'>
 <p>Whether to include the NRPE client on the Nagios clients. Default is true.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_use_https</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>false</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to configure the Nagios web interface to use HTTPS. Default is false. We recommend using a reverse proxy with SSL termination in front of the Nagios web interface, so this is disabled by default.</p>
 </div>
       
     </li>
@@ -320,10 +340,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-26
-27
-28
-29
 30
 31
 32
@@ -365,10 +381,88 @@ inherited by all classes except defines.
 68
 69
 70
-71</pre>
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 26</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 30</span>
 
 class confdroid_nagios::params (
 
@@ -387,6 +481,9 @@ class confdroid_nagios::params (
   String $ng_u_home            = &#39;/home/nagios&#39;,
   Integer $ng_u_uid            = 1004,
 
+# httpd
+  Boolean $ng_use_https       = false,
+
 ) {
 # Default facts
   $fqdn                     = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
@@ -413,6 +510,77 @@ class confdroid_nagios::params (
   $ng_cmd_dir                 = &quot;${ng_spool_dir}/cmd&quot;
   $ng_checkresults_dir        = &quot;${ng_spool_dir}/checkresults&quot;
 
+# files
+  $ng_nagios_cfg_file         = &quot;${ng_main_dir}/nagios.cfg&quot;
+  $ng_nagios_cfg_erb          = &#39;confdroid_nagios/nagios/nagios_cfg.erb&#39;
+
+## old
+  $ng_main_config             = &quot;${ng_main_dir}/nagios.cfg&quot;
+  $ng_cgi_cfg_file            = &quot;${ng_main_dir}/cgi.cfg&quot;
+  $ng_cgi_cfg_erb             = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39;
+  $ng_htpasswd_file           = &quot;${ng_main_dir}/passwd&quot;
+  $ng_htpasswd_head           = &#39;confdroid_nagios/nagios/htpasswd_head.erb&#39;
+  $ng_htpasswd_rule           = &#39;confdroid_nagios/nagios/htpasswd_rule.erb&#39;
+  $ng_taccgi_erb              = &#39;confdroid_nagios/selinux/taccgi.erb&#39;
+  $ng_statcgi_erb             = &#39;confdroid_nagios/selinux/statuscgi.erb&#39;
+  $ng_statdat_erb             = &#39;confdroid_nagios/selinux/statusdat.erb&#39;
+  $ng_checknrpe_erb           = &#39;confdroid_nagios/selinux/checknrpe.erb&#39;
+  $ng_checknagios_erb         = &#39;confdroid_nagios/selinux/checknagios.erb&#39;
+  $ng_nagios_conf             = &#39;/etc/httpd/conf.d/nagios.conf&#39;
+  $ng_nagios_conf_erb         = &#39;confdroid_nagios/httpd/nagios_conf.erb&#39;
+  $ng_welcome_conf            = &#39;/etc/httpd/conf.d/welcome.conf&#39;
+  $ng_welcome_conf_erb        = &#39;confdroid_nagios/httpd/welcome_conf.erb&#39;
+  $ng_forward_conf            = &#39;/etc/httpd/conf.d/nagios_forward.conf&#39;
+  $ng_forward_conf_erb        = &#39;confdroid_nagios/httpd/forward_conf.erb&#39;
+  $ng_get_cert_erb            = &#39;confdroid_nagios/certbot/get_cert.erb&#39;
+  $ng_unless_get_cert         = &#39;confdroid_nagios/certbot/unless_get_cert.erb&#39;
+  $ng_unless_renew_erb        = &#39;confdroid_nagios/certbot/unless_renew_cert.erb&#39;
+  $ng_index_html_file         = &#39;/var/www/html/index.html&#39;
+  $ng_index_html_erb          = &#39;confdroid_nagios/httpd/index_html.erb&#39;
+  $ng_ssl_vhost_file          = &#39;/etc/httpd/conf.d/nagios_ssl.conf&#39;
+  $ng_ssl_vhost_erb           = &#39;confdroid_nagios/httpd/nagios_ssl_vhost.erb&#39;
+  $ng_resource_erb            = &#39;confdroid_nagios/nagios/resource_cfg.erb&#39;
+  $ng_grep_erb                = &#39;confdroid_nagios/selinux/grep.erb&#39;
+
+# certbot
+  $ng_certbot_main_dir        = &#39;/etc/letsencrypt&#39;
+  $ng_certbot_archive         = &quot;${ng_certbot_main_dir}/archive&quot;
+  $ng_certbot_check           = &quot;${ng_certbot_archive}/${ng_webserver_name}/cert1.pem&quot;
+  $ng_certbot_live            = &quot;${ng_certbot_main_dir}/live&quot;
+
+# nagios
+  $ng_target_templates        = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;
+  $ng_templates_head_erb      = &#39;confdroid_nagios/nagios/templates_cfg_head.erb&#39;
+  $ng_templates_rule_erb      = &#39;confdroid_nagios/nagios/templates_cfg_rule.erb&#39;
+  $ng_tgt_timeperiods_base    = &quot;${ng_conf_d_dir}/nagios_timeperiods.cfg&quot;
+  $ng_tgt_timep_add           = &quot;${ng_conf_d_dir}/nagios_timeperiods_add.cfg&quot;
+  $ng_tgt_timep_head_erb      = &#39;confdroid_nagios/nagios/timeperiods_cfg_head.erb&#39;
+  $ng_tgt_timep_rule_erb      = &#39;confdroid_nagios/nagios/timeperiods_cfg_rule.erb&#39;
+  $ng_target_localhost        = &quot;${ng_conf_d_dir}/nagios_localhost.cfg&quot;
+  $ng_target_host             = &quot;${ng_conf_d_dir}/nagios_host.cfg&quot;
+  $ng_target_hostgroup_base   = &quot;${ng_conf_d_dir}/nagios_hostgroups_base.cfg&quot;
+  $ng_tgt_hostgroup_add       = &quot;${ng_conf_d_dir}/nagios_hostgroups_add.cfg&quot;
+  $ng_tgt_hostgrp_head_erb    = &#39;confdroid_nagios/nagios/hostgroups_cfg_head.erb&#39;
+  $ng_tgt_hostgrp_rule_erb    = &#39;confdroid_nagios/nagios/hostgroups_cfg_rule.erb&#39;
+  $ng_target_hostdep          = &quot;${ng_conf_d_dir}/nagios_hostdependency.cfg&quot;
+  $ng_target_hostesc          = &quot;${ng_conf_d_dir}/nagios_hostescalation.cfg&quot;
+  $ng_target_hostext          = &quot;${ng_conf_d_dir}/nagios_hostextinfo.cfg&quot;
+  $ng_target_service          = &quot;${ng_conf_d_dir}/nagios_service.cfg&quot;
+  $ng_target_svcgrp_base      = &quot;${ng_conf_d_dir}/nagios_servicegroups_base.cfg&quot;
+  $ng_tgt_servicegroup_add    = &quot;${ng_conf_d_dir}/nagios_servicegroups_add.cfg&quot;
+  $ng_tgt_svcgrp_head_erb     = &#39;confdroid_nagios/nagios/svcgroups_cfg_head.erb&#39;
+  $ng_tgt_svcgrp_rule_erb     = &#39;confdroid_nagios/nagios/svcgroups_cfg_rule.erb&#39;
+  $ng_target_base_contact     = &quot;${ng_conf_d_dir}/nagios_contact_base.cfg&quot;
+  $ng_target_add_contact      = &quot;${ng_conf_d_dir}/nagios_contact_add.cfg&quot;
+  $ng_contacts_head_erb       = &#39;confdroid_nagios/nagios/contacts_cfg_head.erb&#39;
+  $ng_contacts_rule_erb       = &#39;confdroid_nagios/nagios/contacts_cfg_rule.erb&#39;
+  $ng_tgt_contactgroup_base   = &quot;${ng_conf_d_dir}/nagios_contactgroup_base.cfg&quot;
+  $ng_tgt_contactgroup_add    = &quot;${ng_conf_d_dir}/nagios_contactgroup_add.cfg&quot;
+  $ng_cntctgrps_head_erb      = &#39;confdroid_nagios/nagios/contactgroups_cfg_head.erb&#39;
+  $ng_cntctgrps_rule_erb      = &#39;confdroid_nagios/nagios/contactgroups_cfg_rule.erb&#39;
+  $ng_target_command          = &quot;${ng_conf_d_dir}/nagios_commands_base.cfg&quot;
+  $ng_nagios_service_cmd      = &#39;check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios&#39;
+
 # includes must be last
   include confdroid_nagios::main::config
 }</pre>

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html

@@ -77,7 +77,7 @@
 </div>
 
   <h2>Summary</h2>
-  Class manages server file configuration for the confdroid_nagios module.
+  Class manages configuration files for the confdroid_nagios module.
 
 <h2>Overview</h2>
 <div class="docstring">
@@ -108,7 +108,13 @@
 10
 11
 12
-13</pre>
+13
+14
+15
+16
+17
+18
+19</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
@@ -117,9 +123,15 @@ class confdroid_nagios::server::files (
 
 ) inherits confdroid_nagios::params {
   require confdroid_nagios::main::dirs
-#  if $ng_nagios_server == $fqdn {
+  if $ng_nagios_server == $fqdn {
-#    #config here
+    file { $ng_nagios_cfg_file:
-#  }
+      ensure  =&gt; file,
+      owner   =&gt; $ng_user,
+      group   =&gt; $ng_user,
+      mode    =&gt; &#39;0644&#39;,
+      content =&gt; template($ng_nagios_cfg_erb),
+    }
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html

@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: confdroid_nagios::server::nagios
+  
+    &mdash; Documentation by YARD 0.9.36
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "puppet_classes::confdroid_nagios::server::nagios";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">confdroid_nagios::server::nagios</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: confdroid_nagios::server::nagios</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="confdroid_nagios_3A_3Aparams.html" title="puppet_classes::confdroid_nagios::params (puppet_class)">confdroid_nagios::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/server/nagios.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages nagios resources for the confdroid_nagios module.
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>confdroid_nagios::server::nagios.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p>
+
+  </div>
+</div>
+
+
+
+<div class="tags">
+  
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+6
+7
+8
+9
+10</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/server/nagios.pp', line 6</span>
+
+class confdroid_nagios::server::nagios (
+
+) inherits confdroid_nagios::params {
+  # config here
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+     Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
+</div>
+
+    </div>
+  </body>
+</html>