Use Icinga 1.x Apache conf

This Apache conf is from Icinga 1.x and should work with Apache 2.2 and
2.4.

fixes #7929
This commit is contained in:
Tim Hardeck 2014-12-02 18:26:29 +01:00 committed by Michael Friedrich
parent fc42cb575c
commit ac6768d870
1 changed files with 38 additions and 22 deletions

View File

@ -11,20 +11,28 @@ ScriptAlias /icinga/cgi-bin "@CMAKE_INSTALL_FULL_LIBDIR@/icinga/cgi"
# SSLRequireSSL # SSLRequireSSL
Options ExecCGI Options ExecCGI
AllowOverride None AllowOverride None
Order allow,deny
<IfVersion < 2.3>
Allow from all
# Order deny,allow
# Deny from all
# Allow from 127.0.0.1
</IfVersion>
<IfVersion >= 2.3>
Require all granted
</IfVersion>
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
# Require local
Require valid-user Require valid-user
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
# Order deny,allow
# Deny from all
# Allow from 127.0.0.1
Require valid-user
</IfModule>
</Directory> </Directory>
Alias /icinga "@CMAKE_INSTALL_FULL_DATADIR@/icinga/" Alias /icinga "@CMAKE_INSTALL_FULL_DATADIR@/icinga/"
@ -33,19 +41,27 @@ Alias /icinga "@CMAKE_INSTALL_FULL_DATADIR@/icinga/"
# SSLRequireSSL # SSLRequireSSL
Options None Options None
AllowOverride All AllowOverride All
<IfVersion < 2.3>
Order allow,deny
Allow from all
# Order deny,allow
# Deny from all
# Allow from 127.0.0.1
</IfVersion>
<IfVersion >= 2.3>
Require all granted
</IfVersion>
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
# Require local
Require valid-user Require valid-user
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
# Order deny,allow
# Deny from all
# Allow from 127.0.0.1
Require valid-user
</IfModule>
</Directory> </Directory>