[packages/horde/HORDE_3_3] - migrate to apache 2.4 - rel 3

[baggins]

commit 2d3d54c5b83c54683151fb39f8fb4e0b9250397d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:10:37 2013 +0200

    - migrate to apache 2.4
    - rel 3

 horde.conf => horde-apache.conf |  2 --
 horde-httpd.conf                | 40 ++++++++++++++++++++++++++++++++++++++++
 horde.spec                      | 12 +++++++-----
 3 files changed, 47 insertions(+), 7 deletions(-)
---
diff --git a/horde.spec b/horde.spec
index ceb893a..7a94061 100644
--- a/horde.spec
+++ b/horde.spec
@@ -14,14 +14,15 @@ Summary(pl.UTF-8):	Wspólny szkielet Horde do wszystkich modułów Horde
 Summary(pt_BR.UTF-8):	Componentes comuns do Horde usados por todos os módulos
 Name:		%{hordeapp}
 Version:	3.3.13
-Release:	2
+Release:	3
 License:	LGPL
 Group:		Applications/WWW
 Source0:	http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
 # Source0-md5:	5a0486a5f6f96a9957e770ddabe71b38
-Source1:	%{name}.conf
+Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	README.PLD
+Source4:	%{name}-httpd.conf
 Patch0:		%{name}-path.patch
 Patch1:		%{name}-shell.disabled.patch
 Patch3:		%{name}-blank-admins.patch
@@ -78,6 +79,7 @@ Suggests:	wv
 Suggests:	xlhtml
 Obsoletes:	horde-mysql
 Obsoletes:	horde-pgsql
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -192,7 +194,7 @@ cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
 
 ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 > $RPM_BUILD_ROOT/var/log/horde/%{hordeapp}.log
@@ -232,10 +234,10 @@ fi
 %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/horde.conf b/horde-apache.conf
similarity index 99%
rename from horde.conf
rename to horde-apache.conf
index 0620eb6..021815a 100644
--- a/horde.conf
+++ b/horde-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <IfModule mod_alias.c>
     Alias /horde /usr/share/horde
 </IfModule>
diff --git a/horde-httpd.conf b/horde-httpd.conf
new file mode 100644
index 0000000..d18f9e0
--- /dev/null
+++ b/horde-httpd.conf
@@ -0,0 +1,40 @@
+<IfModule mod_alias.c>
+    Alias /horde /usr/share/horde
+</IfModule>
+
+<Directory /usr/share/horde>
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+    <IfModule mod_expires.c>
+        ExpiresActive On
+        ExpiresByType image/png "now plus 1 month"
+        ExpiresByType image/gif "now plus 1 month"
+        ExpiresByType text/javascript "now plus 1 month"
+        ExpiresByType application/x-javascript "now plus 1 month"
+        ExpiresByType text/css "now plus 1 month"
+    </IfModule>
+</Directory>
+
+<Directory "/usr/share/horde/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/rpc">
+    <IfModule mod_rewrite.c>
+        RewriteEngine On
+        RewriteCond %{REQUEST_FILENAME} !-d
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteRule ^(.*)$ index.php/$1 [QSA,L]
+    </IfModule>
+</Directory>
+<Directory "/usr/share/horde/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde.git/commitdiff/2d3d54c5b83c54683151fb39f8fb4e0b9250397d