Merge remote-tracking branch 'shared/master' into leap_master

3 files changed, 58 insertions, 18 deletions

diff --git a/files/configs/CentOS/nagios.cfg b/files/configs/CentOS/nagios.cfg
index 1354bf8..b88e3db 100644
--- a/files/configs/CentOS/nagios.cfg
+++ b/files/configs/CentOS/nagios.cfg
@@ -31,9 +31,22 @@ log_file=/var/log/nagios/nagios.log
 # separate from host and contact definitions...
 
 # Puppet-managed configuration files
-cfg_dir=/etc/nagios/conf.d
-
-
+cfg_file=/etc/nagios/nagios_templates.cfg
+cfg_file=/etc/nagios/nagios_command.cfg
+cfg_file=/etc/nagios/nagios_contact.cfg
+cfg_file=/etc/nagios/nagios_contactgroup.cfg
+cfg_file=/etc/nagios/nagios_host.cfg
+cfg_file=/etc/nagios/nagios_hostdependency.cfg
+cfg_file=/etc/nagios/nagios_hostescalation.cfg
+cfg_file=/etc/nagios/nagios_hostextinfo.cfg
+cfg_file=/etc/nagios/nagios_hostgroup.cfg
+cfg_file=/etc/nagios/nagios_hostgroupescalation.cfg
+cfg_file=/etc/nagios/nagios_service.cfg
+cfg_file=/etc/nagios/nagios_servicedependency.cfg
+cfg_file=/etc/nagios/nagios_serviceescalation.cfg
+cfg_file=/etc/nagios/nagios_serviceextinfo.cfg
+cfg_file=/etc/nagios/nagios_servicegroup.cfg
+cfg_file=/etc/nagios/nagios_timeperiod.cfg
 
 # OBJECT CACHE FILE
 # This option determines where object definitions are cached when
diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg
index 68e03bb..291a474 100644
--- a/files/configs/Debian/nagios.cfg
+++ b/files/configs/Debian/nagios.cfg
@@ -23,7 +23,22 @@ log_file=/var/log/nagios3/nagios.log
 #cfg_file=/etc/nagios3/commands.cfg
 
 # Puppet-managed configuration files
-cfg_dir=/etc/nagios3/conf.d
+cfg_file=/etc/nagios3/nagios_templates.cfg
+cfg_file=/etc/nagios3/nagios_command.cfg
+cfg_file=/etc/nagios3/nagios_contact.cfg
+cfg_file=/etc/nagios3/nagios_contactgroup.cfg
+cfg_file=/etc/nagios3/nagios_host.cfg
+cfg_file=/etc/nagios3/nagios_hostdependency.cfg
+cfg_file=/etc/nagios3/nagios_hostescalation.cfg
+cfg_file=/etc/nagios3/nagios_hostextinfo.cfg
+cfg_file=/etc/nagios3/nagios_hostgroup.cfg
+cfg_file=/etc/nagios3/nagios_hostgroupescalation.cfg
+cfg_file=/etc/nagios3/nagios_service.cfg
+cfg_file=/etc/nagios3/nagios_servicedependency.cfg
+cfg_file=/etc/nagios3/nagios_serviceescalation.cfg
+cfg_file=/etc/nagios3/nagios_serviceextinfo.cfg
+cfg_file=/etc/nagios3/nagios_servicegroup.cfg
+cfg_file=/etc/nagios3/nagios_timeperiod.cfg
 
 # Debian also defaults to using the check commands defined by the debian
 # nagios-plugins package
diff --git a/files/configs/apache2.conf b/files/configs/apache2.conf
index 14bb38b..f0f8b2f 100644
--- a/files/configs/apache2.conf
+++ b/files/configs/apache2.conf
@@ -1,8 +1,8 @@
 # apache configuration for nagios 3.x
 # note to users of nagios 1.x and 2.x:
-#   throughout this file are commented out sections which preserve
-#   backwards compatibility with bookmarks/config for older nagios versios.
-#   simply look for lines following "nagios 1.x:" and "nagios 2.x" comments.
+#	throughout this file are commented out sections which preserve
+#	backwards compatibility with bookmarks/config for older nagios versios.
+#	simply look for lines following "nagios 1.x:" and "nagios 2.x" comments.
 
 ScriptAlias /cgi-bin/nagios3 /usr/lib/cgi-bin/nagios3
 ScriptAlias /nagios3/cgi-bin /usr/lib/cgi-bin/nagios3
@@ -28,22 +28,34 @@ Alias /nagios3 /usr/share/nagios3/htdocs
 #Alias /nagios /usr/share/nagios3/htdocs
 
 <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)>
-    Options FollowSymLinks
+	Options FollowSymLinks
 
-    DirectoryIndex index.php index.html
+	DirectoryIndex index.php index.html
 
-    AllowOverride AuthConfig
-    Order Allow,Deny
-    Allow From All
+	AllowOverride AuthConfig
 
-    AuthName "Nagios Access"
-    AuthType Basic
-    AuthUserFile /etc/nagios3/htpasswd.users
-    # nagios 1.x:
-    #AuthUserFile /etc/nagios/htpasswd.users
-    require valid-user
+
+    <IfVersion < 2.3>
+        Order Allow,Deny
+        Allow From All
+    </IfVersion>
+
+    <IfVersion >= 2.3>
+        Require all denied
+    </IfVersion>
+
+	AuthName "Nagios Access"
+	AuthType Basic
+	AuthUserFile /etc/nagios3/htpasswd.users
+	# nagios 1.x:
+	#AuthUserFile /etc/nagios/htpasswd.users
+	require valid-user
 </DirectoryMatch>
 
+<Directory /usr/share/nagios3/htdocs>
+	Options	+ExecCGI	
+</Directory>
+
 # Enable this ScriptAlias if you want to enable the grouplist patch.
 # See http://apan.sourceforge.net/download.html for more info
 # It allows you to see a clickable list of all hostgroups in the