- simplify config by merging sections

Changed files:
    nagios-apache.conf -> 1.9

diff --git a/nagios-apache.conf b/nagios-apache.conf
index a16f38a841e8051dc1d0b4fd2c230570df3abbd6..07ea15fcdec88ffa82765e1e3b102a424ec28007 100644 (file)
--- a/nagios-apache.conf
+++ b/nagios-apache.conf
@@ -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/