[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 6cb7ff230de585f4745105eb5514b5bb6ac19a91
Author: David Prévot <taffit at debian.org>
Date:   Sun Jul 14 11:09:05 2013 -0400

    Define default logfile in /var/log/owncloud.log
    
    Existing logfile is moved to /var/log/owncloud.log in default setup
    (i.e. if it was in /var/lib/owncloud/data/owncloud.log).
    
    Git-Dch: Full

diff --git a/debian/patches/fix_log_path.diff b/debian/patches/fix_log_path.diff
new file mode 100644
index 0000000..396f120
--- /dev/null
+++ b/debian/patches/fix_log_path.diff
@@ -0,0 +1,28 @@
+Description: Improve logfile handling
+ Log in /var/log/owncloud.log by default.
+Author: David Prévot <taffit at debian.org>
+Bug-Debian: http://bugs.debian.org/715484
+Forwarded: not-needed
+Last-Update: 2013-07-14
+--- a/config/config.sample.php
++++ b/config/config.sample.php
+@@ -128,7 +128,7 @@
+ /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
+ "log_type" => "owncloud",
+ 
+-/* File for the owncloud logger to log to, (default is ownloud.log in the data dir */
++/* File for the owncloud logger to log to, (default is /var/log/ownloud.log in Debian) */
+ "logfile" => "",
+ 
+ /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
+--- a/lib/log/owncloud.php
++++ b/lib/log/owncloud.php
+@@ -33,7 +33,7 @@
+ 	 * Init class data
+ 	 */
+ 	public static function init() {
+-		$defaultLogFile = OC_Config::getValue("datadirectory", '/var/lib/owncloud/data').'/owncloud.log';
++		$defaultLogFile = '/var/log/owncloud.log';
+ 		self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
+ 		if (!file_exists(self::$logFile)) {
+ 			self::$logFile = $defaultLogFile;
diff --git a/debian/patches/series b/debian/patches/series
index b883820..13e1940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix_upgrade.diff
 fix_displayed_version.diff
 fix_aws-sdk.diff
 fix_crypt_blowfish.diff
+fix_log_path.diff

-- 
owncloud.git