adding more parameters

manifests/server/files.pp

@@ -37,6 +37,20 @@ class cd_nagios::server::files (
 
     # manage nagios.cfg
 
+    file { $ng_nagios_cfg_file:
+      ensure    =>  file,
+      path      =>  $ng_nagios_cfg_file,
+      owner     =>  'root',
+      group     =>  'root',
+      mode      =>  '0644',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      content   =>  template($ng_nagios_cfg_erb),
+      notify    =>  Service[$ng_service],
+    }
+
     # manage cgi.cfg
 
     file { $ng_cgi_cfg_file:
@@ -53,20 +67,11 @@ class cd_nagios::server::files (
       notify    =>  Service[$ng_service],
     }
 
-    # manage nagios.conf for httpd
+    # since we use vhost files, we do not want the regular file to appear
+    # after upgrades to avoid conflicts
 
     file { $ng_nagios_conf:
       ensure    =>  absent,
-#      path      =>  $ng_nagios_conf,
-#      owner     =>  'root',
-#      group     =>  'root',
-#      mode      =>  '0644',
-#      selrange  =>  s0,
-#      selrole   =>  object_r,
-#      seltype   =>  httpd_config_t,
-#      seluser   =>  system_u,
-#      content   =>  template($ng_nagios_conf_erb),
-#      notify    =>  Service[$ae_service],
     }
 
     file { $ng_forward_conf: