SOURCES: nagios-apache.conf - tabs - single Alias and ScriptAlias ...

[glen]

Author: glen                         Date: Tue Mar 14 14:44:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- tabs
- single Alias and ScriptAlias definition for making admin easier to put them into vhost

---- Files affected:
SOURCES:
   nagios-apache.conf (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/nagios-apache.conf
diff -u SOURCES/nagios-apache.conf:1.5 SOURCES/nagios-apache.conf:1.6
--- SOURCES/nagios-apache.conf:1.5	Wed Nov 30 21:48:04 2005
+++ SOURCES/nagios-apache.conf	Tue Mar 14 15:44:13 2006
@@ -2,48 +2,45 @@
 
 # WITHOUT SSL
 <IfModule !mod_ssl.c>
-ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
 <Directory /usr/lib/nagios/cgi/>
-   Options ExecCGI
-   Order deny,allow
-   Deny from all
-   Allow from 127.0.0.1
+    Options ExecCGI
+    Order deny,allow
+    Deny from all
+    Allow from 127.0.0.1
 </Directory>
 
-Alias /nagios/ /usr/share/nagios/
 <Directory /usr/share/nagios/>
-   Options None
-   Order deny,allow
-   Deny from all
-   Allow from 127.0.0.1
+    Options None
+    Order deny,allow
+    Deny from all
+    Allow from 127.0.0.1
 </Directory>
 </IfModule>
 
 # WITH SSL ENABLED
 <IfModule mod_ssl.c>
-ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
 <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
+    Options ExecCGI
+    SSLRequireSSL
+    Allow from all
+    AuthType Basic
+    AuthUserFile /etc/webapps/nagios/passwd
+    AuthGroupFile /etc/webapps/nagios/group
+    AuthName "Nagios"
+    Require group nagios
 </Directory>
 
-Alias /nagios/ /usr/share/nagios/
 <Directory /usr/share/nagios/>
-   Options None
-   SSLRequireSSL
-   Allow from all
-   AuthType Basic
-   AuthUserFile /etc/webapps/nagios/passwd
-   AuthGroupFile /etc/webapps/nagios/group
-   AuthName "Nagios"
-   Require group nagios
+    Options None
+    SSLRequireSSL
+    Allow from all
+    AuthType Basic
+    AuthUserFile /etc/webapps/nagios/passwd
+    AuthGroupFile /etc/webapps/nagios/group
+    AuthName "Nagios"
+    Require group nagios
 </Directory>
 </IfModule>
 
-# vim: filetype=apache ts=4 sw=4 et
+ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
+Alias /nagios/ /usr/share/nagios/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nagios-apache.conf?r1=1.5&r2=1.6&f=u