153 lines
4.2 KiB
Diff
153 lines
4.2 KiB
Diff
Description: compliance with both Apache 2.4 and 2.2
|
|
Author: Xavier Guimard <x.guimard@free.fr>
|
|
Bug: http://jira.ow2.org/browse/LEMONLDAP-571
|
|
Bug-Debian: http://bugs.debian.org/669808
|
|
Bug-Debian: http://bugs.debian.org/669809
|
|
Bug-Debian: http://bugs.debian.org/669822
|
|
Forwarded: http://jira.ow2.org/browse/LEMONLDAP-571
|
|
Last-Update: 2013-05-31
|
|
|
|
--- a/_example/etc/handler-apache2.conf
|
|
+++ b/_example/etc/handler-apache2.conf
|
|
@@ -21,17 +21,27 @@
|
|
# needed): choose your URL to avoid restarting Apache when
|
|
# configuration change
|
|
<Location /reload>
|
|
- Order deny,allow
|
|
- Deny from all
|
|
- Allow from 127.0.0.0/8
|
|
+ <IfVersion < 2.4>
|
|
+ Order deny,allow
|
|
+ Deny from all
|
|
+ Allow from 127.0.0.0/8
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require ip 127
|
|
+ </IfVersion>
|
|
PerlHeaderParserHandler Lemonldap::NG::Handler->refresh
|
|
</Location>
|
|
|
|
# Uncomment this to activate status module
|
|
#<Location /status>
|
|
- # Order deny,allow
|
|
- # Deny from all
|
|
- # Allow from 127.0.0.0/8
|
|
+ # <IfVersion < 2.4>
|
|
+ # Order deny,allow
|
|
+ # Deny from all
|
|
+ # Allow from 127.0.0.0/8
|
|
+ # </IfVersion>
|
|
+ # <IfVersion >= 2.4>
|
|
+ # Require ip 127
|
|
+ # </IfVersion>
|
|
# PerlHeaderParserHandler Lemonldap::NG::Handler->status
|
|
#</Location>
|
|
|
|
--- a/_example/etc/manager-apache2.conf
|
|
+++ b/_example/etc/manager-apache2.conf
|
|
@@ -12,8 +12,13 @@
|
|
# DocumentRoot
|
|
DocumentRoot __MANAGERDIR__
|
|
<Directory __MANAGERDIR__>
|
|
- Order deny,allow
|
|
- Allow from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order allow,deny
|
|
+ Allow from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all granted
|
|
+ </IfVersion>
|
|
Options +ExecCGI +FollowSymLinks
|
|
</Directory>
|
|
|
|
@@ -21,8 +26,13 @@
|
|
Alias /doc/ __DOCDIR__
|
|
Alias /lib/ __DOCDIR__lib/
|
|
<Directory __DOCDIR__>
|
|
- Order allow,deny
|
|
- Allow from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order deny,allow
|
|
+ Allow from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all granted
|
|
+ </IfVersion>
|
|
ErrorDocument 404 /notfound.html
|
|
Options +FollowSymLinks
|
|
</Directory>
|
|
--- a/_example/etc/portal-apache2.conf
|
|
+++ b/_example/etc/portal-apache2.conf
|
|
@@ -12,8 +12,13 @@
|
|
# DocumentRoot
|
|
DocumentRoot __PORTALDIR__
|
|
<Directory __PORTALDIR__>
|
|
- Order allow,deny
|
|
- Allow from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order allow,deny
|
|
+ Allow from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all granted
|
|
+ </IfVersion>
|
|
Options +ExecCGI +FollowSymLinks
|
|
</Directory>
|
|
|
|
@@ -29,26 +34,46 @@
|
|
|
|
# SOAP functions for sessions management (disabled by default)
|
|
<Location /index.pl/adminSessions>
|
|
- Order deny,allow
|
|
- Deny from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order deny,allow
|
|
+ Deny from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all denied
|
|
+ </IfVersion>
|
|
</Location>
|
|
|
|
# SOAP functions for sessions access (disabled by default)
|
|
<Location /index.pl/sessions>
|
|
- Order deny,allow
|
|
- Deny from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order deny,allow
|
|
+ Deny from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all denied
|
|
+ </IfVersion>
|
|
</Location>
|
|
|
|
# SOAP functions for configuration access (disabled by default)
|
|
<Location /index.pl/config>
|
|
- Order deny,allow
|
|
- Deny from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order deny,allow
|
|
+ Deny from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all denied
|
|
+ </IfVersion>
|
|
</Location>
|
|
|
|
# SOAP functions for notification insertion (disabled by default)
|
|
<Location /index.pl/notification>
|
|
- Order deny,allow
|
|
- Deny from all
|
|
+ <IfVersion < 2.4>
|
|
+ Order deny,allow
|
|
+ Deny from all
|
|
+ </IfVersion>
|
|
+ <IfVersion >= 2.4>
|
|
+ Require all denied
|
|
+ </IfVersion>
|
|
</Location>
|
|
|
|
# SAML2 Issuer
|