[packages/ldap-account-manager] - migrated to apache 2.4

[baggins]

commit 43e6ee997b1345a91aedb081514bf4f7f052a189
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 22:25:41 2013 +0200

    - migrated to apache 2.4

 httpd.conf                | 37 +++++++++++++++++++++++++++++++++++++
 ldap-account-manager.spec | 10 ++++++----
 2 files changed, 43 insertions(+), 4 deletions(-)
---
diff --git a/ldap-account-manager.spec b/ldap-account-manager.spec
index bf652f9..a4c1ad6 100644
--- a/ldap-account-manager.spec
+++ b/ldap-account-manager.spec
@@ -8,13 +8,14 @@ Summary(de.UTF-8):	Administration von Benutzern, Gruppen und Hosts für LDAP-Ser
 Summary(pl.UTF-8):	LDAP Account Manager (LAM) - interfejs WWW do zarządzania kontami na serwerze LDAP
 Name:		ldap-account-manager
 Version:	3.9
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/WWW
 Source0:	http://downloads.sourceforge.net/lam/%{name}-%{version}.tar.gz
 # Source0-md5:	44f33cfd2a900ad9739692a7f4844f51
 Source1:	apache.conf
 Source2:	lighttpd.conf
+Source3:	httpd.conf
 URL:		http://lam.sourceforge.net/
 Patch0:		configdir.patch
 Patch1:		loginbysearch.patch
@@ -39,6 +40,7 @@ Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires:	webserver(indexfile)
 Requires:	webserver(php)
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -160,7 +162,7 @@ mv $RPM_BUILD_ROOT%{_appdir}/lib/lamdaemon.pl $RPM_BUILD_ROOT%{_sbindir}
 # config
 mv $RPM_BUILD_ROOT{%{_appdir}/config/*,%{_sysconfdir}}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 # apidocs
@@ -196,10 +198,10 @@ exit 0
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 0000000..f03a30a
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,37 @@
+Alias /lam /usr/share/ldap-account-manager
+
+<Directory /usr/share/ldap-account-manager>
+	Options +FollowSymLinks
+	AllowOverride All
+	Require all granted
+	DirectoryIndex index.html
+</Directory>
+
+<Directory /var/lib/ldap-account-manager/tmp>
+	Options -Indexes
+</Directory>
+
+<Directory /var/lib/ldap-account-manager/sess>
+	Options -Indexes
+	Require all denied
+</Directory>
+
+<Directory /var/lib/ldap-account-manager/config>
+	Options -Indexes
+	Require all denied
+</Directory>
+
+<Directory /usr/share/ldap-account-manager/lib>
+	Options -Indexes
+	Require all denied
+</Directory>
+
+<Directory /usr/share/ldap-account-manager/help>
+	Options -Indexes
+	Require all denied
+</Directory>
+
+<Directory /usr/share/ldap-account-manager/locale>
+	Options -Indexes
+	Require all denied
+</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ldap-account-manager.git/commitdiff/43e6ee997b1345a91aedb081514bf4f7f052a189