Recommit for updates in build 47

2026-02-14 19:41:42 +01:00
parent f12eb43a39
commit 3e19179245
4 changed files with 355 additions and 2273 deletions
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Adirs.html
@@ -300,188 +300,188 @@ class confdroid_nagios::main::dirs (
  require confdroid_nagios::main::user

  # main directory
-  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,
-  }
+#  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,
-  }
+#  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,
-  }
+#  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,
+#  }

-  if $fqdn == $ng_nagios_server {
+#  if $fqdn == $ng_nagios_server {
    # /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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
+#    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,
-    }
-  }
+#    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,
+#    }
+#  }
 }</pre>
      </td>
    </tr>
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Afiles.html
@@ -124,16 +124,16 @@ class confdroid_nagios::server::files (

 ) inherits confdroid_nagios::params {
  require confdroid_nagios::main::dirs
-  if $ng_nagios_server == $fqdn {
-    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),
-      notify  =&gt; Service[$ng_nagios_service],
-    }
-  }
+#  if $ng_nagios_server == $fqdn {
+#    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),
+#      notify  =&gt; Service[$ng_nagios_service],
+#    }
+#  }
 }</pre>
      </td>
    </tr>
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Aservice.html
@@ -123,15 +123,15 @@ class confdroid_nagios::server::service (

 ) inherits confdroid_nagios::params {
  require confdroid_nagios::server::files
-  if $ng_nagios_server == $fqdn {
-    service { $ng_nagios_service:
-      ensure     =&gt; running,
-      name       =&gt; $ng_nagios_service,
-      enable     =&gt; true,
-      hasrestart =&gt; true,
-      hasstatus  =&gt; true,
-    }
-  }
+#  if $ng_nagios_server == $fqdn {
+#    service { $ng_nagios_service:
+#      ensure     =&gt; running,
+#      name       =&gt; $ng_nagios_service,
+#      enable     =&gt; true,
+#      hasrestart =&gt; true,
+#      hasstatus  =&gt; true,
+#    }
+#  }
 }</pre>
      </td>
    </tr>