- fix p1.pl location

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

diff --git a/nagios-apache.conf b/nagios-apache.conf
index 220034796046968030eda90ad0bb4ec7541c3e53..57c2575d8b198f7fefe862b0ec849fbed08def1b 100644 (file)
--- a/nagios-apache.conf
+++ b/nagios-apache.conf
@@ -1,51 +1,45 @@
 # $Id$
 
-# 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>
+<Directory ~ "/usr/lib/nagios/cgi/|/usr/share/nagios/">
+       Options ExecCGI
 
-Alias /nagios/ /usr/share/nagios/
-<Directory /usr/share/nagios/>
-   Options None
-   Order deny,allow
-   Deny from all
-   Allow from 127.0.0.1
-</Directory>
-</IfModule>
+       # 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>
-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/webapps/nagios/passwd
-   AuthGroupFile /etc/webapps/nagios/group
-   AuthName "Nagios"
-   Require group nagios
+       # WITH SSL ENABLED
+       <IfModule mod_ssl.c>
+               SSLRequireSSL
+
+               Allow from all
+               AuthType Basic
+               AuthName "Nagios"
+
+               # LDAP based Authz. Apache 1.3
+               <IfModule mod_auth_ldap.c>
+                       AuthLDAPEnabled on
+                       AuthLDAPURL ldap://ldap.example.org/ou=People,dc=example,dc=org?uid?sub?(objectClass=*)
+               </IfModule>
+
+               AuthUserFile /etc/webapps/nagios/passwd
+               AuthGroupFile /etc/webapps/nagios/group
+               Require group nagios
+       </IfModule>
 </Directory>
 
-Alias /nagios/ /usr/share/nagios/
-<Directory /usr/share/nagios/>
-   Options None
-   SSLRequireSSL
-   Order deny,allow
-   Deny from all
-   AuthType Basic
-   AuthUserFile /etc/webapps/nagios/passwd
-   AuthGroupFile /etc/webapps/nagios/group
-   AuthName "Nagios"
-   Require group nagios
+# 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>
-</IfModule>
 
-# vim: filetype=apache ts=4 sw=4 et
+ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi/
+Alias /nagios/docs/ /usr/share/doc/nagios/
+Alias /nagios/ /usr/share/nagios/