Author: glen Date: Wed Mar 10 19:06:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- simplify config by merging sections
---- Files affected:
packages/nagios:
nagios-apache.conf (1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/nagios/nagios-apache.conf
diff -u packages/nagios/nagios-apache.conf:1.8
packages/nagios/nagios-apache.conf:1.9
--- packages/nagios/nagios-apache.conf:1.8 Mon Mar 5 23:17:14 2007
+++ packages/nagios/nagios-apache.conf Wed Mar 10 20:06:02 2010
@@ -2,38 +2,33 @@
# 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/>
+# icons to jabber notify messages...
+<Directory /usr/share/nagios>
Allow from all
</Directory>
-# WITHOUT SSL
-<IfModule !mod_ssl.c>
-<Directory /usr/lib/nagios/cgi/>
+<Directory /usr/lib/nagios/cgi>
Options ExecCGI
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1
-</Directory>
-</IfModule>
-# WITH SSL ENABLED
-<IfModule mod_ssl.c>
-<Directory /usr/lib/nagios/cgi/>
- Options ExecCGI
- SSLRequireSSL
- Allow from all
- AuthType Basic
- AuthUserFile /etc/webapps/nagios/passwd
- AuthGroupFile /etc/webapps/nagios/group
- AuthName "Nagios"
- Require group nagios
-</Directory>
+ # WITHOUT SSL
+ <IfModule !mod_ssl.c>
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.1
+ </IfModule>
+
+ # WITH SSL ENABLED
+ <IfModule mod_ssl.c>
+ SSLRequireSSL
-<Directory /usr/share/nagios/>
- SSLRequireSSL
+ Allow from all
+ AuthType Basic
+ AuthUserFile /etc/webapps/nagios/passwd
+ AuthGroupFile /etc/webapps/nagios/group
+ AuthName "Nagios"
+ Require group nagios
+ </IfModule>
</Directory>
-</IfModule>
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
Alias /nagios/ /usr/share/nagios/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios-apache.conf?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
