packages: nagios/nagios-apache.conf - require auth for /usr/share/nagios fi...

[glen]

Author: glen                         Date: Sat Jan  7 17:38:19 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- require auth for /usr/share/nagios files (leave /images still open), so other apps can be under nagios auth umbrella, besides nagios interface now uses php scripts

---- Files affected:
packages/nagios:
   nagios-apache.conf (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/nagios/nagios-apache.conf
diff -u packages/nagios/nagios-apache.conf:1.10 packages/nagios/nagios-apache.conf:1.11
--- packages/nagios/nagios-apache.conf:1.10	Wed Mar 10 21:01:19 2010
+++ packages/nagios/nagios-apache.conf	Sat Jan  7 18:38:14 2012
@@ -1,16 +1,6 @@
 # $Id$
 
-# We grant access to static files for everybody, as the files are available
-# publically anyway, but without having it with http password i'm able to link
-# icons to jabber notify messages...
-<Directory /usr/share/nagios>
-	Allow from all
-</Directory>
-<Directory /usr/share/doc/nagios>
-	Allow from all
-</Directory>
-
-<Directory /usr/lib/nagios/cgi>
+<Directory ~ "/usr/lib/nagios/cgi/|/usr/share/nagios/">
 	Options ExecCGI
 
 	# WITHOUT SSL
@@ -26,11 +16,22 @@
 
 		Allow from all
 		AuthType Basic
+		AuthName "Nagios"
+
 		AuthUserFile /etc/webapps/nagios/passwd
 		AuthGroupFile /etc/webapps/nagios/group
-		AuthName "Nagios"
 		Require group nagios
 	</IfModule>
+</Directory>
+
+# We grant access to static images for everybody, as the files are available
+# publically anyway, but without having it with http password i'm able to link
+# icons to jabber notify messages :)
+<Directory /usr/share/nagios/images>
+	Allow from all
+</Directory>
+<Directory /usr/share/doc/nagios>
+	Allow from all
 </Directory>
 
 ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios-apache.conf?r1=1.10&r2=1.11&f=u