dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Apache2.X for Debian

Browse Source
This commit is contained in:
Xavier Guimard 2015-06-19 10:40:55 +00:00
parent d686ea5728
commit a5cfe75d64
9 changed files with 10 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/liblemonldap-ng-handler-perl.examples vendored
View File

@ -1,3 +1,3 @@
debian/tmp/etc/lemonldap-ng/handler-apache2.conf
debian/tmp/etc/lemonldap-ng/test-apache2.conf
debian/tmp/etc/lemonldap-ng/handler-apache2.X.conf
debian/tmp/etc/lemonldap-ng/test-apache2.X.conf
debian/tmp/var/lib/lemonldap-ng/test

4
debian/liblemonldap-ng-handler-perl.install vendored
View File

@ -2,5 +2,5 @@
/usr/share/man/man3/Lemonldap::NG::Handler*
/var/lib/lemonldap-ng/test
/usr/share/lemonldap-ng/bin/purgeLocalCache
/etc/lemonldap-ng/handler-apache2.conf
/etc/lemonldap-ng/test-apache2.conf
/etc/lemonldap-ng/handler-apache2.X.conf
/etc/lemonldap-ng/test-apache2.X.conf

4
debian/liblemonldap-ng-handler-perl.links vendored
View File

@ -1,2 +1,2 @@
/etc/lemonldap-ng/handler-apache2.conf /etc/apache2/sites-available/handler-apache2.conf
/etc/lemonldap-ng/test-apache2.conf /etc/apache2/sites-available/test-apache2.conf
/etc/lemonldap-ng/handler-apache2.X.conf /etc/apache2/sites-available/handler-apache2.X.conf
/etc/lemonldap-ng/test-apache2.X.conf /etc/apache2/sites-available/test-apache2.X.conf

2
debian/liblemonldap-ng-manager-perl.install vendored
View File

@ -1,5 +1,5 @@
/usr/share/perl5/Lemonldap/NG/Manager*
/etc/lemonldap-ng/manager-apache2.conf
/etc/lemonldap-ng/manager-apache2.X.conf
/usr/share/lemonldap-ng/manager
/var/lib/lemonldap-ng/manager
/usr/share/lemonldap-ng/bin/lmConfigEditor

2
debian/liblemonldap-ng-manager-perl.links vendored
View File

@ -1,2 +1,2 @@
/etc/lemonldap-ng/manager-apache2.conf /etc/apache2/sites-available/manager-apache2.conf
/etc/lemonldap-ng/manager-apache2.X.conf /etc/apache2/sites-available/manager-apache2.X.conf

2
debian/liblemonldap-ng-portal-perl.install vendored
View File

@ -6,4 +6,4 @@
/usr/share/lemonldap-ng/bin/buildPortalWSDL
/usr/share/lemonldap-ng/portal
/var/lib/lemonldap-ng/portal
/etc/lemonldap-ng/portal-apache2.conf
/etc/lemonldap-ng/portal-apache2.X.conf

2
debian/liblemonldap-ng-portal-perl.links vendored
View File

@ -1,4 +1,4 @@
/etc/lemonldap-ng/portal-apache2.conf /etc/apache2/sites-available/portal-apache2.conf
/etc/lemonldap-ng/portal-apache2.X.conf /etc/apache2/sites-available/portal-apache2.X.conf
/usr/share/lemonldap-ng/portal/cdc.pl /var/lib/lemonldap-ng/portal/cdc.pl
/usr/share/lemonldap-ng/portal/index.pl /var/lib/lemonldap-ng/portal/index.pl
/usr/share/lemonldap-ng/portal/mail.pl /var/lib/lemonldap-ng/portal/mail.pl

152
debian/patches/comment-Apache2.4-configuration.patch vendored
View File

@ -1,152 +0,0 @@
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

1
debian/patches/series vendored
View File

@ -1 +0,0 @@
comment-Apache2.4-configuration.patch