summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-11-19 23:39:59 +0100
committerRemi Collet <fedora@famillecollet.com>2012-11-19 23:39:59 +0100
commit9d7bd992175323d482b6545e4d1af9834c25fd63 (patch)
treea2a63611f0f994930da0f86d17c444fd0b42332e
parentd943ec2f01916826fe417a4e82918f499c67529c (diff)
php-horde-horde: fix apache config and rename to php-horde-horde.conf
-rw-r--r--horde.conf3
-rw-r--r--php-horde-horde.spec9
2 files changed, 9 insertions, 3 deletions
diff --git a/horde.conf b/horde.conf
index c8096a0..0d32d14 100644
--- a/horde.conf
+++ b/horde.conf
@@ -6,6 +6,8 @@ Alias /horde /usr/share/horde
# you change the authentication backend under the 'Authentication' tab.
# For this reason, Horde is currently only accessible from localhost.
+ Options +FollowSymLinks
+
<IfModule mod_authz_core.c>
# Apache 2.4
Require local
@@ -20,6 +22,7 @@ Alias /horde /usr/share/horde
<IfModule mod_rewrite.c>
RewriteEngine On
+ RewriteBase /horde/
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^(.*)$ rampage.php [QSA,L]
diff --git a/php-horde-horde.spec b/php-horde-horde.spec
index 523c911..c28b888 100644
--- a/php-horde-horde.spec
+++ b/php-horde-horde.spec
@@ -12,7 +12,7 @@
Name: php-horde-horde
Version: 5.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Horde Application Framework
Group: Development/Libraries
@@ -151,7 +151,7 @@ ln -s %{_sysconfdir}/horde %{buildroot}%{pear_hordedir}/config
cp %{buildroot}%{_sysconfdir}/horde/conf.php.dist \
%{buildroot}%{_sysconfdir}/horde/conf.php
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/horde.conf
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
%if 0%{?fedora} > 13
%find_lang %{pear_name}
@@ -183,7 +183,7 @@ fi
%files -f %{pear_name}-%{version}/%{pear_name}.lang
%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/horde.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%attr(0770,apache,apache) %dir %{_sysconfdir}/horde
%attr(0770,apache,apache) %dir %{_sysconfdir}/horde/registry.d
%attr(0640,apache,apache) %config %{_sysconfdir}/horde/*.dist
@@ -224,6 +224,9 @@ fi
%changelog
+* Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.0.2-2
+- fix apache config and rename to php-horde-horde.conf
+
* Thu Nov 15 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.0.2-1
- update to 5.0.2 for remi repo