[owncloud] 4.5.9
brummbq
brummbq at fedoraproject.org
Sat Apr 13 08:47:39 UTC 2013
commit 4215568480be07cac5574c71dbc576653b57790f
Author: Gregor Tätzner <gregor at freenet.de>
Date: Sat Apr 13 10:47:27 2013 +0200
4.5.9
.gitignore | 1 +
owncloud-4.5-nginx.conf | 8 ++++++++
owncloud-README.fedora | 10 +++++-----
owncloud-delete-jslint.sh | 2 +-
owncloud-httpd-2.2.conf | 12 ++++++++++++
owncloud.spec | 14 ++++++--------
sources | 2 +-
7 files changed, 34 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92d57fc..455bae9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/owncloud-4.5.7-repack.tar.bz2
/owncloud-4.5.8-repack.tar.bz2
+/owncloud-4.5.9-repack.tar.bz2
diff --git a/owncloud-4.5-nginx.conf b/owncloud-4.5-nginx.conf
index 025c7a8..eab1079 100644
--- a/owncloud-4.5-nginx.conf
+++ b/owncloud-4.5-nginx.conf
@@ -1,15 +1,20 @@
+# redirect http to https.
#server {
# listen 80;
# server_name localhost;
# rewrite ^ https://$server_name$request_uri? permanent; # enforce https
#}
+# owncloud (ssl/tls)
server {
# listen 443 ssl;
listen 80;
server_name localhost;
+ allow 127.0.0.1;
+ deny all;
+
# ssl_certificate /etc/ssl/nginx/cloud.example.com.crt;
# ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key;
@@ -26,10 +31,12 @@ server {
error_page 403 = /core/templates/403.php;
error_page 404 = /core/templates/404.php;
+ # deny direct access
location ~ ^/(data|config|\.ht|db_structure\.xml|README) {
deny all;
}
+ # default try order
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;
@@ -41,6 +48,7 @@ server {
try_files $uri $uri/ index.php;
}
+ # enable php
location ~ ^(?<script_name>.+?\.php)(?<path_info>/.*)?$ {
try_files $script_name = 404;
diff --git a/owncloud-README.fedora b/owncloud-README.fedora
index 7b1892f..9a3d6ec 100644
--- a/owncloud-README.fedora
+++ b/owncloud-README.fedora
@@ -16,7 +16,7 @@ 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. Note that
these files are just samples. For production setup you should adjust them to
-your needs.
+your needs. Also remote access is disabled by default.
Database
--------
@@ -44,13 +44,13 @@ directory, together with the database and the main configuration.
Logging
-------
-The log output of ownCloud is written to '/var/log/owncloud.log'.
-You can set the loglevel in the main config file. By default the built-in log
-mechanism of ownCloud is used.
+Specified by the main configuration, ownCloud sends messages to the system
+logger ('syslog'). You can also change the loglevel or switch to the built-in
+log mechanism of ownCloud.
App Store
---------
-If you install additional third party apps with the built-in app store, you can find them
+If you install additional third party apps using the built-in app store, you can find them
in the directory '/var/lib/owncloud/apps'. This functionality is enabled by default.
diff --git a/owncloud-delete-jslint.sh b/owncloud-delete-jslint.sh
index 813f1f1..1e76abb 100755
--- a/owncloud-delete-jslint.sh
+++ b/owncloud-delete-jslint.sh
@@ -8,7 +8,7 @@ tar -xf $1
# delete jslint
pushd owncloud/apps/files_texteditor/js/aceeditor/
-sed -ie "/define('ace\/worker\/jshint'/,/});\/\* -\*- Mode:/d" worker-javascript.js
+sed -i "/define('ace\/worker\/jshint'/,/});\/\* -\*- Mode:/d" worker-javascript.js
popd
tar -cjf $REPACK_SOURCE owncloud
diff --git a/owncloud-httpd-2.2.conf b/owncloud-httpd-2.2.conf
index bf40d78..0e61b0f 100644
--- a/owncloud-httpd-2.2.conf
+++ b/owncloud-httpd-2.2.conf
@@ -3,6 +3,18 @@ Alias /owncloud /usr/share/owncloud
<Directory /usr/share/owncloud/>
Options -Indexes
+ <IfModule mod_authz_host.c>
+ # Apache 2.4
+ Require local
+ </IfModule>
+ <IfModule !mod_authz_host.c>
+ # Apache 2.2
+ Order Deny,Allow
+ Deny from all
+ Allow from 127.0.0.1
+ Allow from ::1
+ </IfModule>
+
ErrorDocument 404 /core/templates/404.php
php_value upload_max_filesize 512M
diff --git a/owncloud.spec b/owncloud.spec
index ca06e82..7051ad3 100644
--- a/owncloud.spec
+++ b/owncloud.spec
@@ -1,6 +1,6 @@
Name: owncloud
-Version: 4.5.8
+Version: 4.5.9
Release: 1%{?dist}
Summary: Private file sync and share server
@@ -9,8 +9,7 @@ URL: http://owncloud.org
# removed any occurences of jslint, see script delete-jslint
Source0: %{name}-%{version}-repack.tar.bz2
# orig source: http://owncloud.org/releases/%{name}-%{version}.tar.bz2
-Source1: %{name}-httpd-2.2.conf
-Source2: %{name}-httpd-2.4.conf
+Source1: %{name}-httpd.conf
Source6: %{name}-4.5-nginx.conf
# packaging notes and doc
Source3: %{name}-README.fedora
@@ -220,13 +219,8 @@ install -pm 644 config/config.sample.php %{buildroot}%{_sysconfdir}/%{name}/conf
ln -sf %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config
# httpd config
-%if 0%{?fedora} >= 18
-install -Dpm 644 %{SOURCE2} \
- %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
-%else
install -Dpm 644 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
-%endif
# nginx config
install -Dpm 644 %{SOURCE6} \
@@ -312,6 +306,10 @@ fi
%changelog
+* Sat Apr 13 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 4.5.9-1
+- 4.5.9
+- disable remote access by default
+
* Fri Mar 15 2013 Gregor Tätzner <brummbq at fedoraproject.org> - 4.5.8-1
- 4.5.8
- unbundle dropbox-php
diff --git a/sources b/sources
index 6b47d82..61df8a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1726f27dbe7263e724e3358261092014 owncloud-4.5.8-repack.tar.bz2
+4a9015cd2a456c98bfea188a0d460eee owncloud-4.5.9-repack.tar.bz2
More information about the scm-commits
mailing list