[packages/horde-kronolith] - migrated to apache 2.4
baggins
baggins at pld-linux.org
Wed May 15 19:51:34 CEST 2013
commit b4bcafc3d435cf226b07f728123a32bc53000ab7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed May 15 19:51:32 2013 +0200
- migrated to apache 2.4
horde-kronolith.spec | 12 +++++++-----
kronolith.conf => kronolith-apache.conf | 2 --
kronolith-httpd.conf | 22 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/horde-kronolith.spec b/horde-kronolith.spec
index 6e3bc54..1f52c25 100644
--- a/horde-kronolith.spec
+++ b/horde-kronolith.spec
@@ -5,12 +5,13 @@ Summary: Kronolith - calendar for Horde
Summary(pl.UTF-8): Kronolith - kalendarz dla Horde
Name: horde-%{hordeapp}
Version: 2.3.5
-Release: 2
+Release: 3
License: LGPL
Group: Applications/WWW
Source0: ftp://ftp.horde.org/pub/kronolith/%{hordeapp}-h3-%{version}.tar.gz
# Source0-md5: 3305f6f2951c863b57c39d258d796ae6
-Source1: %{hordeapp}.conf
+Source1: %{hordeapp}-apache.conf
+Source2: %{hordeapp}-httpd.conf
URL: http://www.horde.org/kronolith/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
@@ -22,6 +23,7 @@ Suggests: php-pear-Date
Suggests: php-pear-Date_Holidays >= 0.17.1
Suggests: php-pear-XML_Serializer
Obsoletes: kronolith
+Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,7 +90,7 @@ cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -114,10 +116,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}
%files
diff --git a/kronolith.conf b/kronolith-apache.conf
similarity index 98%
rename from kronolith.conf
rename to kronolith-apache.conf
index 3d16be9..cdf0da1 100644
--- a/kronolith.conf
+++ b/kronolith-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
<Directory "/usr/share/horde/kronolith/config">
order deny,allow
deny from all
diff --git a/kronolith-httpd.conf b/kronolith-httpd.conf
new file mode 100644
index 0000000..f341403
--- /dev/null
+++ b/kronolith-httpd.conf
@@ -0,0 +1,22 @@
+<Directory "/usr/share/horde/kronolith/config">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/kronolith/feed">
+ <IfModule mod_rewrite.c>
+ RewriteEngine On
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteRule ^(.*)$ index.php?c=$1 [QSA,L]
+ </IfModule>
+</Directory>
+<Directory "/usr/share/horde/kronolith/lib">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/kronolith/locale">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/kronolith/templates">
+ Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/horde-kronolith.git/commitdiff/b4bcafc3d435cf226b07f728123a32bc53000ab7
More information about the pld-cvs-commit
mailing list