[owncloud] 4.5.8
brummbq
brummbq at fedoraproject.org
Fri Mar 15 22:16:22 UTC 2013
commit fb9eb664f4ce3b14644ec1c74bebc53655d0a853
Author: Gregor Tätzner <gregor at freenet.de>
Date: Fri Mar 15 23:16:00 2013 +0100
4.5.8
.gitignore | 1 +
owncloud-4.5-nginx.conf | 58 +++++++++++++++
...5.7-config.patch => owncloud-4.5.8-config.patch | 14 +++--
owncloud-README.fedora | 8 ++-
owncloud-logrotate.conf | 5 --
owncloud.spec | 74 ++++++++++++++------
sources | 2 +-
7 files changed, 126 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8502679..92d57fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/owncloud-4.5.7-repack.tar.bz2
+/owncloud-4.5.8-repack.tar.bz2
diff --git a/owncloud-4.5-nginx.conf b/owncloud-4.5-nginx.conf
new file mode 100644
index 0000000..025c7a8
--- /dev/null
+++ b/owncloud-4.5-nginx.conf
@@ -0,0 +1,58 @@
+#server {
+# listen 80;
+# server_name localhost;
+# rewrite ^ https://$server_name$request_uri? permanent; # enforce https
+#}
+
+server {
+# listen 443 ssl;
+ listen 80;
+
+ server_name localhost;
+
+# ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
+# ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
+
+ root /usr/share/owncloud;
+
+ client_max_body_size 1G; # set max upload size
+ fastcgi_buffers 64 4K;
+
+ rewrite ^/caldav((/|$).*)$ /remote.php/caldav$1 last;
+ rewrite ^/carddav((/|$).*)$ /remote.php/carddav$1 last;
+ rewrite ^/webdav((/|$).*)$ /remote.php/webdav$1 last;
+
+ index index.php;
+ error_page 403 = /core/templates/403.php;
+ error_page 404 = /core/templates/404.php;
+
+ location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
+ deny all;
+ }
+
+ location / {
+ rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+ rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+ rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
+ rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
+
+ rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
+
+ try_files $uri $uri/ index.php;
+ }
+
+ location ~ ^(?<script_name>.+?\.php)(?<path_info>/.*)?$ {
+ try_files $script_name = 404;
+
+ include fastcgi.conf;
+ fastcgi_param PATH_INFO $path_info;
+# fastcgi_param HTTPS on;
+ fastcgi_pass 127.0.0.1:9000;
+ }
+
+ location ~* ^.+.(jpg|jpeg|gif|bmp|ico|png|css|js|swf)$ {
+ expires 30d;
+ # Optional: Don't log access to assets
+ access_log off;
+ }
+}
diff --git a/owncloud-4.5.7-config.patch b/owncloud-4.5.8-config.patch
similarity index 74%
rename from owncloud-4.5.7-config.patch
rename to owncloud-4.5.8-config.patch
index afd9fbd..e4b885d 100644
--- a/owncloud-4.5.7-config.patch
+++ b/owncloud-4.5.8-config.patch
@@ -1,11 +1,15 @@
---- config/config.sample.php.orig 2013-02-19 21:09:08.000000000 +0100
-+++ config/config.sample.php 2013-02-24 17:40:06.120241595 +0100
-@@ -90,7 +90,7 @@
- "log_type" => "owncloud",
+--- config/config.sample.php.orig 2013-03-15 21:45:48.681009331 +0100
++++ config/config.sample.php 2013-03-15 21:47:31.915012419 +0100
+@@ -87,10 +87,10 @@
+ "updatechecker" => true,
+
+ /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+-"log_type" => "owncloud",
++"log_type" => "syslog",
/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
-"logfile" => "",
-+"logfile" => "/var/log/owncloud.log",
++#"logfile" => "/var/log/owncloud.log",
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
"loglevel" => "",
diff --git a/owncloud-README.fedora b/owncloud-README.fedora
index 165f44f..7b1892f 100644
--- a/owncloud-README.fedora
+++ b/owncloud-README.fedora
@@ -6,15 +6,17 @@ Start
After installation you should be able to access the login/configuration page
on following url:
-http://localhost/owncloud/
+http://localhost/owncloud/ or http://localhost/
If not, make sure your webserver is running properly.
Webserver
---------
-Currently ownCloud in Fedora supports only one webserver: httpd (apache).
+Currently ownCloud in Fedora supports following webserver: httpd and nginx.
You must install at least on webserver subpackage (owncloud-<webserver>). These
-packages include additional configuration files for the webservers, if necessary.
+packages include additional configuration files for the webservers. Note that
+these files are just samples. For production setup you should adjust them to
+your needs.
Database
--------
diff --git a/owncloud.spec b/owncloud.spec
index 24c3f45..ca06e82 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,7 +1,7 @@
Name: owncloud
-Version: 4.5.7
-Release: 2%{?dist}
+Version: 4.5.8
+Release: 1%{?dist}
Summary: Private file sync and share server
License: AGPLv3+ and MIT and BSD and CC-BY and CC-BY-SA and GPLv3 and Public Domain and (MPLv1.1 or GPLv2+ or LGPLv2+) and (MIT or GPL+) and (MIT or GPLv2) and ASL 2.0 and LGPLv3
@@ -10,9 +10,8 @@ URL: http://owncloud.org
Source0: %{name}-%{version}-repack.tar.bz2
# orig source: http://owncloud.org/releases/%{name}-%{version}.tar.bz2
Source1: %{name}-httpd-2.2.conf
-Source6: %{name}-httpd-2.4.conf
-# very basic
-Source2: %{name}-logrotate.conf
+Source2: %{name}-httpd-2.4.conf
+Source6: %{name}-4.5-nginx.conf
# packaging notes and doc
Source3: %{name}-README.fedora
Source4: %{name}-mysql.txt
@@ -21,7 +20,7 @@ Source5: %{name}-postgresql.txt
# used to repack the source tarball
Source42: %{name}-delete-jslint.sh
-Patch0: %{name}-4.5.7-config.patch
+Patch0: %{name}-4.5.8-config.patch
# triggers selinux avc, write access on config/config.php is sufficient
Patch1: %{name}-4.5.7-disable-config-dir-access-check.patch
# remove calls to jslint
@@ -48,12 +47,11 @@ Requires: php-filter
# other PHP libs
Requires: php-getid3 php-PHPMailer php-cloudfiles php-phpass
# PHP PEAR dependencies
-Requires: php-pear(Crypt_Blowfish)
+Requires: php-pear(Crypt_Blowfish) php-pear(pear.dropbox-php.com/Dropbox)
Requires: php-pear(Net_Curl) php-pear(XML_Parser)
# SabreDAV
Requires: php-pear(Sabre_CalDAV) php-pear(Sabre_CardDAV)
-# for logrotate
-Requires: rsyslog
+
%if 0%{?rhel}
Requires(post): policycoreutils-python
@@ -88,7 +86,17 @@ Requires: php
%{summary}
-# imagine something like %%package nginx or lighttpd here
+%package nginx
+Summary: Nginx integration for ownCloud
+
+Provides: %{name}-webserver = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+
+# PHP dependencies
+Requires: php-fpm nginx
+
+%description nginx
+%{summary}
%package mysql
@@ -144,7 +152,7 @@ Requires: php-pear(MDB2)
%patch13
# Strip bundled libraries
-rm -rf 3rdparty/{Archive,Console,Crypt_Blowfish,OS,Sabre,simpletest,getid3,php-cloudfiles,phpass,PEAR}
+rm -rf 3rdparty/{Archive,Console,Crypt_Blowfish,OS,Sabre,simpletest,getid3,php-cloudfiles,phpass,PEAR,Dropbox}
rm -f 3rdparty/{Sabre.includes,System,class.phpmailer,class.smtp,MDB2,PEAR5}.php
# keep MDB2-Schema - consider upgrading system MDB2-Schema to latest git snapshot
@@ -213,18 +221,16 @@ ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
# httpd config
%if 0%{?fedora} >= 18
-install -Dpm 644 %{SOURCE6} \
+install -Dpm 644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
%else
install -Dpm 644 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
%endif
-# logging
-mkdir -p %{buildroot}%{_localstatedir}/log
-touch %{buildroot}%{_localstatedir}/log/owncloud.log
-
-install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+# nginx config
+install -Dpm 644 %{SOURCE6} \
+ %{buildroot}%{_sysconfdir}/nginx/conf.d/%{name}.conf
%if 0%{?rhel}
@@ -255,6 +261,27 @@ if [ $1 -eq 0 ]; then
%endif
fi
+%post nginx
+%if 0%{?fedora} || 0%{?rhel} > 6
+ /usr/bin/systemctl reload nginx.service > /dev/null 2>&1 || :
+ /usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
+%else
+ /sbin/service nginx reload > /dev/null 2>&1 || :
+ /sbin/service php-fpm reload > /dev/null 2>&1 || :
+%endif
+
+%postun nginx
+if [ $1 -eq 0 ]; then
+%if 0%{?fedora} || 0%{?rhel} > 6
+ /usr/bin/systemctl reload nginx.service > /dev/null 2>&1 || :
+ /usr/bin/systemctl reload php-fpm.service > /dev/null 2>&1 || :
+%else
+ /sbin/service nginx reload > /dev/null 2>&1 || :
+ /sbin/service php-fpm reload > /dev/null 2>&1 || :
+%endif
+fi
+
+
%files
%doc AUTHORS COPYING-AGPL COPYING-README README README.fedora config/config.sample.php
@@ -262,22 +289,19 @@ fi
# contains sensitive data (dbpassword, passwordsalt)
%config(noreplace) %attr(0600,apache,apache) %{_sysconfdir}/%{name}/config.php
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/lib/MDB2
%dir %attr(0755,apache,apache) %{_localstatedir}/lib/%{name}
# user data must not be world readable
%dir %attr(0750,apache,apache) %{_localstatedir}/lib/%{name}/data
-
%attr(-,apache,apache) %{_localstatedir}/lib/%{name}/apps
-%ghost %{_localstatedir}/log/owncloud.log
-
%files httpd
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%files nginx
+%config(noreplace) %{_sysconfdir}/nginx/conf.d/%{name}.conf
%files mysql
%doc README.mysql
@@ -288,6 +312,12 @@ fi
%changelog
+* Fri Mar 15 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 4.5.8-1
+- 4.5.8
+- unbundle dropbox-php
+- log to syslog
+- include nginx config
+
* Mon Feb 25 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 4.5.7-2
- added script for re-creating stripped tarball
- new httpd.conf for httpd 2.4
diff --git a/sources b/sources
index 6eab5ce..6b47d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-260dc71c39984703dea7060d8f4a876c owncloud-4.5.7-repack.tar.bz2
+1726f27dbe7263e724e3358261092014 owncloud-4.5.8-repack.tar.bz2
More information about the scm-commits
mailing list