From a34481e68e0810bc176360b820397a3da11ec514 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 7 Apr 2015 16:22:33 -0400 Subject: Add missing DirectoryIndex index.php to the pnp4nagios apache config snippet --- files/pnp4nagios/apache.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'files') diff --git a/files/pnp4nagios/apache.conf b/files/pnp4nagios/apache.conf index 8f66756..816bf05 100644 --- a/files/pnp4nagios/apache.conf +++ b/files/pnp4nagios/apache.conf @@ -27,4 +27,5 @@ Alias /pnp4nagios "/usr/share/pnp4nagios/html" # Rewrite all other URLs to index.php/URL RewriteRule .* index.php/$0 [PT,L] + DirectoryIndex index.php -- cgit v1.2.3 From f2e75a6e5143ad794275ee7c1c14577d787095cb Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Sun, 19 Apr 2015 15:18:46 -0400 Subject: Only use the private directory on CentOS Debian and ubuntu have their resource.cfg file placed in /etc/nagios3/ and when it's absent it can cause issues with the package (because the package is badly done). --- files/configs/Debian/nagios.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'files') diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg index 8eae393..41a2e3c 100644 --- a/files/configs/Debian/nagios.cfg +++ b/files/configs/Debian/nagios.cfg @@ -67,7 +67,7 @@ precached_object_file=/var/lib/nagios3/objects.precache # defined as macros in this file and restrictive permissions (600) # can be placed on this file. -resource_file=/etc/nagios3/private/resource.cfg +resource_file=/etc/nagios3/resource.cfg -- cgit v1.2.3 From 7cb5f0625c929ccbc6029b6bb12f97f7f2bfe70a Mon Sep 17 00:00:00 2001 From: Matt Taggart Date: Thu, 8 Oct 2015 14:51:58 -0700 Subject: update the apache2.conf file updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly whitespace changes, one 2.2 vs 2.4 change and a change for docs. --- files/configs/apache2.conf | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'files') 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 - 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 + + + Order Allow,Deny + Allow From All + + + = 2.3> + Require all denied + + + AuthName "Nagios Access" + AuthType Basic + AuthUserFile /etc/nagios3/htpasswd.users + # nagios 1.x: + #AuthUserFile /etc/nagios/htpasswd.users + require valid-user + + Options +ExecCGI + + # 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 -- cgit v1.2.3