- rel 3

[packages/nagios.git] / nagios-apache.conf

diff --git a/nagios-apache.conf b/nagios-apache.conf
index a14ec131af33a038cea63905e25dcc0b0ea4cf35..a16f38a841e8051dc1d0b4fd2c230570df3abbd6 100644 (file)
--- a/nagios-apache.conf
+++ b/nagios-apache.conf
@@ -1,49 +1,39 @@
+# $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>
+
 # 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
-</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 ExecCGI
+       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
-   order deny,allow
-   deny from all
-   AuthType Basic
-   AuthUserFile /etc/nagios/passwd
-   AuthGroupFile /etc/nagios/group
-   AuthName "nagios"
-   require group nagios
-   Satisfy Any
+       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
-   order deny,allow
-   deny from all
-   AuthType Basic
-   AuthUserFile /etc/nagios/passwd
-   AuthGroupFile /etc/nagios/group
-   AuthName "nagios"
-   require group nagios
-   Satisfy Any
+       SSLRequireSSL
 </Directory>
 </IfModule>
+
+ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
+Alias /nagios/ /usr/share/nagios/