[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/5.0.8+dfsg-2-4-g6cb7ff2

[David Prévot]

The following commit has been merged in the master branch:
commit 034bdd9ed53ea679b0f71b5a12f58ecaed686afe
Author: David Prévot <taffit at debian.org>
Date:   Sun Jul 14 10:49:05 2013 -0400

    Fix logfile path in logrotate, revert the symlink
    
    Le 14/07/2013 08:37, gregor herrmann a écrit :
    > The problem is that owncloud writes the log to what is defined as
    > 'datadirectory' in /etc/owncloud/config.php, and this can be
    > anything, not just the default /var/lib/owncloud/data.
    
    Git-Dch: Ignore

diff --git a/debian/owncloud.links b/debian/owncloud.links
index 92c7e5a..7f5b3ef 100644
--- a/debian/owncloud.links
+++ b/debian/owncloud.links
@@ -7,9 +7,6 @@ var/lib/owncloud/themes usr/share/owncloud/themes
 etc/owncloud usr/share/owncloud/config
 etc/owncloud/htaccess usr/share/owncloud/.htaccess
 
-# Log into /var/log
-var/log/owncloud.log	var/lib/owncloud/data/owncloud.log
-
 # Link JavaScript files from the locations in dependency packages.
 usr/share/javascript/jquery/jquery.min.js usr/share/owncloud/core/js/jquery-1.7.2.min.js
 usr/share/javascript/jquery-jplayer/Jplayer.swf usr/share/owncloud/apps/media/js/Jplayer.swf
diff --git a/debian/owncloud.logrotate b/debian/owncloud.logrotate
index 39630bd..0f66991 100644
--- a/debian/owncloud.logrotate
+++ b/debian/owncloud.logrotate
@@ -1,4 +1,4 @@
-/var/log/owncloud {
+/var/log/owncloud.log {
   rotate 6
   monthly
   compress
diff --git a/debian/owncloud.preinst b/debian/owncloud.preinst
index 49986e9..0d476cf 100644
--- a/debian/owncloud.preinst
+++ b/debian/owncloud.preinst
@@ -6,7 +6,7 @@ set -e
 
 # Don’t lose existing logfile on upgrade [ Can be removed before Jessie ]
 file=/var/lib/owncloud/data/owncloud.log
-if [ -f $file ] && [ ! -L $file ]; then
+if [ -f $file ] && [ ! -L $file ] && [ ! -f /var/log/owncloud.log ] ; then
 	mv $file /var/log 2>/dev/null
 fi
 

-- 
owncloud.git