[Pkg-owncloud-commits] [SCM] owncloud.git branch, no_var_install, updated. debian/4.0.1debian-2-21-g0f559ae

[Paul van Tilburg]

The following commit has been merged in the no_var_install branch:
commit 56f790d4cdfdf1a7adcbd9f00ca1562a83dba580
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jun 13 22:02:23 2012 +0200

    Update patch for new location of config (/etc/owncloud)

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 5995b56..4219f3b 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -22,13 +22,13 @@ Last-Update: <2011-11-16>
  		}
  
 -		if( !file_exists( OC::$SERVERROOT."/config/config.php" )){
-+		if( !file_exists( "/var/lib/owncloud/config/config.php" )){
++		if( !file_exists( "/etc/owncloud/config.php" )){
  			return false;
  		}
  
  		// Include the file, save the data from $CONFIG
 -		include( OC::$SERVERROOT."/config/config.php" );
-+		include( "/var/lib/owncloud/config/config.php" );
++		include( "/etc/owncloud/config.php" );
  		if( isset( $CONFIG ) && is_array( $CONFIG )){
  			self::$cache = $CONFIG;
  		}
@@ -37,7 +37,7 @@ Last-Update: <2011-11-16>
  
  		// Write the file
 -		$result=@file_put_contents( OC::$SERVERROOT."/config/config.php", $content );
-+		$result=@file_put_contents( "/var/lib/owncloud/config/config.php", $content );
++		$result=@file_put_contents( "/etc/owncloud/config.php", $content );
  		if(!$result) {
  			$tmpl = new OC_Template( '', 'error', 'guest' );
  			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));

-- 
owncloud.git