migrated to apache 2.4

diff --git a/httpd.conf b/httpd.conf
new file mode 100644 (file)
index 0000000..d269367
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,25 @@
+Alias /owncloud /usr/share/owncloud
+<Directory /usr/share/owncloud>
+       ErrorDocument 403 /owncloud/core/templates/403.php
+       ErrorDocument 404 /owncloud/core/templates/404.php
+       <IfModule mod_php5.c>
+               php_value upload_max_filesize 512M
+               php_value post_max_size 512M
+               php_value memory_limit 512M
+       </IfModule>
+       <IfModule mod_rewrite.c>
+               RewriteEngine on
+               RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+               RewriteRule ^.well-known/host-meta /owncloud/public.php?service=host-meta [QSA,L]
+               RewriteRule ^.well-known/carddav /owncloud/remote.php/carddav/ [R]
+               RewriteRule ^.well-known/caldav /owncloud/remote.php/caldav/ [R]
+               RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
+               RewriteRule ^remote/(.*) remote.php [QSA,L]
+       </IfModule>
+       Options -Indexes
+       Require all granted
+</Directory>
+
+<Directory /usr/share/owncloud/data>
+       Require all denied
+</Directory>

diff --git a/owncloud.spec b/owncloud.spec
index 8f234330df407911f444675897c2717dace0d04a..3b447328b1aece71a74d1f794ace3868dec9442b 100644 (file)
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -14,7 +14,7 @@
 Summary:       Private file sync and share server
 Name:          owncloud
 Version:       5.0.6
-Release:       0.1
+Release:       0.2
 License:       AGPL v3, MIT
 Group:         Applications/WWW
 Source0:       http://download.owncloud.org/community/%{name}-%{version}.tar.bz2
@@ -22,6 +22,7 @@ Source0:      http://download.owncloud.org/community/%{name}-%{version}.tar.bz2
 Source1:       config.php
 Source2:       apache.conf
 Source3:       lighttpd.conf
+Source4:       httpd.conf
 Patch1:                system-config.patch
 Patch2:                pear-not-strict.patch
 URL:           http://owncloud.org
@@ -62,6 +63,7 @@ Suggests:     php-pear-MDB2_Driver_mysql
 Suggests:      php-pear-MDB2_Driver_pgsql
 Suggests:      php-pear-MDB2_Driver_sqlite
 Suggests:      php-pear-MDB2_Driver_sqlite3
+Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -96,7 +98,7 @@ ln -s %{_sysconfdir}/config $RPM_BUILD_ROOT%{_appdir}/config
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config/config.php
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
@@ -110,10 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %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