Recommit for updates in build 12

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html

@@ -108,7 +108,199 @@
 10
 11
 12
-13</pre>
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+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
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -116,9 +308,201 @@
 class confdroid_nagios::main::dirs (
 
 ) inherits confdroid_nagios::params {
-  if $ng_nagios_server == $fqdn {
   require confdroid_nagios::main::user
-    #config here
+  if $ng_nagios_server == $fqdn {
+    # /etc/nagios/conf.d
+    file { $ng_conf_d_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_conf_d_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+    }
+
+    # /etc/nagios/objects
+
+    file { $ng_objects_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_objects_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+    }
+
+    # /etc/nagios/private
+
+    file { $ng_private_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_private_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+      }
+
+    # include dir
+
+    file { $ng_usr_incl:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_usr_incl,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; usr_t,
+      seluser  =&gt; system_u,
+    }
+
+    # log dir
+
+    file { $ng_log_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_log_dir,
+      owner    =&gt; $ng_user,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_log_t,
+      seluser  =&gt; system_u,
+    }
+
+    # log archives
+
+    file { $ng_log_archives:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_log_archives,
+      owner    =&gt; $ng_user,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_log_t,
+      seluser  =&gt; system_u,
+    }
+
+    # /usr/share/nagios
+
+    file { $ng_usr_share:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_usr_share,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; usr_t,
+      seluser  =&gt; system_u,
+    }
+
+    #  /usr/share/nagios/html
+
+    file { $ng_share_html:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_share_html,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; usr_t,
+      seluser  =&gt; system_u,
+    }
+
+    # run dir for pid file
+
+    file { $ng_run_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_run_dir,
+      owner    =&gt; &#39;nagios&#39;,
+      group    =&gt; &#39;nagios&#39;,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_var_run_t,
+      seluser  =&gt; system_u,
+    }
+
+    # cmd dir
+
+    file { $ng_cmd_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_cmd_dir,
+      owner    =&gt; &#39;nagios&#39;,
+      group    =&gt; &#39;nagios&#39;,
+      mode     =&gt; &#39;0775&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_spool_t,
+      seluser  =&gt; system_u,
+    }
+
+    # checkresults dir
+
+    file { $ng_checkresults_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_checkresults_dir,
+      owner    =&gt; &#39;nagios&#39;,
+      group    =&gt; &#39;nagios&#39;,
+      mode     =&gt; &#39;0770&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_spool_t,
+      seluser  =&gt; system_u,
+    }
+  }
+  else {
+    file { $ng_main_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_main_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_etc_t,
+      seluser  =&gt; system_u,
+    }
+
+    # /usr/lib64/nagios dir required for plugins
+
+    file { $ng_lib_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_lib_dir,
+      owner    =&gt; &#39;root&#39;,
+      group    =&gt; &#39;root&#39;,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; lib_t,
+      seluser  =&gt; system_u,
+    }
+
+    # /var/spool/nagios
+
+    file { $ng_spool_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $ng_spool_dir,
+      owner    =&gt; $ng_user,
+      group    =&gt; $ng_user,
+      mode     =&gt; &#39;0755&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; nagios_spool_t,
+      seluser  =&gt; system_u,
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html

@@ -120,7 +120,19 @@
 22
 23
 24
-25</pre>
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -132,7 +144,6 @@ class confdroid_nagios::main::install (
     require confdroid_resources
     # if our FQDN matches the configured Nagios server FQDN, install both server-
     # and client packages.
-    if $fqdn == $ng_nagios_server {
     # we&#39;ll need httpd installed
     require confdroid_apache
 
@@ -143,6 +154,19 @@ class confdroid_nagios::main::install (
       ensure =&gt; $ng_pkg_ensure,
     }
   }
+
+  # if we are not the nagios server, install only client packages
+
+  if $fqdn != $ng_nagios_server {
+    package {$reqpackages_client:
+      ensure =&gt; $pkg_ensure,
+    }
+
+    # if we want to use NRPE, install it
+
+    if $ng_include_nrpe == true {
+      require cd_nrpe
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_nagios_3A_3Aparams.html

@@ -342,7 +342,12 @@ inherited by all classes except defines.
 61
 62
 63
-64</pre>
+64
+65
+66
+67
+68
+69</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 24</span>
@@ -384,6 +389,11 @@ class confdroid_nagios::params (
   $ng_log_dir                 = &#39;/var/log/nagios&#39;
   $ng_log_archives            = &quot;${ng_log_dir}/archives&quot;
   $ng_spool_dir               = &#39;/var/spool/nagios&#39;
+  $ng_usr_share               = &#39;/usr/share/nagios&#39;
+  $ng_share_html              = &quot;${ng_usr_share}/html&quot;
+  $ng_run_dir                 = &#39;/var/run/nagios&#39;
+  $ng_cmd_dir                 = &quot;${ng_spool_dir}/cmd&quot;
+  $ng_checkresults_dir        = &quot;${ng_spool_dir}/checkresults&quot;
 
 # includes must be last
   include confdroid_nagios::main::config