Browse Source

config path

Bob Mottram 9 years ago
parent
commit
75d75a6083
1 changed files with 44 additions and 41 deletions
  1. 44
    41
      src/freedombone

+ 44
- 41
src/freedombone View File

@@ -6524,47 +6524,49 @@ function upgrade_owncloud_finish {
6524 6524
         mkdir $OWNCLOUD_PATH/data
6525 6525
     fi
6526 6526
     cp -r $OWNCLOUD_UPGRADE_PATH/data/* $OWNCLOUD_PATH/data/
6527
-
6528
-    if [ ! -f $OWNCLOUD_PATH/config/config.php ]; then
6529
-        if [ ! -f $OWNCLOUD_PATH/config/config.sample.php ]; then
6530
-            echo $'No owncloud configuration sample file found'
6531
-            exit 54289
6532
-        fi
6533
-        cp $OWNCLOUD_PATH/config/config.sample.php $OWNCLOUD_PATH/config/config.php
6534
-    fi
6535
-
6536
-    if [ -f $OWNCLOUD_UPGRADE_PATH/config/config.php ]; then
6537
-        OWNCLOUD_INSTANCE_ID=$(cat config.php | grep "instanceid" | awk -F "'" '{print $4}')
6538
-        OWNCLOUD_PASSWORD_SALT=$(cat config.php | grep "passwordsalt" | awk -F "'" '{print $4}')
6539
-        OWNCLOUD_DATA_DIR=$(cat config.php | grep "datadirectory" | awk -F "'" '{print $4}')
6540
-        OWNCLOUD_DBTYPE=$(cat config.php | grep "dbtype" | awk -F "'" '{print $4}')
6541
-        OWNCLOUD_DBNAME=$(cat config.php | grep "dbname" | awk -F "'" '{print $4}')
6542
-        OWNCLOUD_DBHOST=$(cat config.php | grep "dbhost" | awk -F "'" '{print $4}')
6543
-        OWNCLOUD_DBUSER=$(cat config.php | grep "dbuser" | awk -F "'" '{print $4}')
6544
-        OWNCLOUD_DBPASS=$(cat config.php | grep "dbpassword" | awk -F "'" '{print $4}')
6545
-        OWNCLOUD_SECRET=$(cat config.php | grep "secret" | awk -F "'" '{print $4}')
6546
-
6547
-        sed -i "s|'instanceid'.*|'instanceid' => '$OWNCLOUD_INSTANCE_ID',|g" $OWNCLOUD_PATH/config/config.php
6548
-        sed -i "s|'passwordsalt'.*|'passwordsalt' => '$OWNCLOUD_PASSWORD_SALT',|g" $OWNCLOUD_PATH/config/config.php
6549
-        sed -i "s|'datadirectory'.*|'datadirectory' => '$OWNCLOUD_DATA_DIR',|g" $OWNCLOUD_PATH/config/config.php
6550
-        sed -i "s|'dbtype'.*|'dbtype' => '$OWNCLOUD_DBTYPE',|g" $OWNCLOUD_PATH/config/config.php
6551
-        sed -i "s|'dbname'.*|'dbname' => '$OWNCLOUD_DBNAME',|g" $OWNCLOUD_PATH/config/config.php
6552
-        sed -i "s|'dbhost'.*|'dbhost' => '$OWNCLOUD_DBHOST',|g" $OWNCLOUD_PATH/config/config.php
6553
-        sed -i "s|'dbuser'.*|'dbuser' => '$OWNCLOUD_DBUSER',|g" $OWNCLOUD_PATH/config/config.php
6554
-        sed -i "s|'dbpassword'.*|'dbpassword' => '$OWNCLOUD_DBPASS',|g" $OWNCLOUD_PATH/config/config.php
6555
-        sed -i "s|'secret'.*|'secret' => '$OWNCLOUD_SECRET',|g" $OWNCLOUD_PATH/config/config.php
6556
-    fi
6557
-
6558
-    # re-index the files
6559
-    for d in /home/*/ ; do
6560
-        USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
6561
-        if [[ $USRNAME != "git" && $USRNAME != "mirrors" ]]; then
6562
-            $OWNCLOUD_PATH/occ files:scan $USRNAME
6563
-        fi
6564
-    done
6565
-
6566
-    # remove the temporary upgrade
6567
-    rm -rf $OWNCLOUD_UPGRADE_PATH
6527
+	chown -R www-data:www-data $OWNCLOUD_PATH/data
6528
+
6529
+	if [ ! -f $OWNCLOUD_PATH/config/config.php ]; then
6530
+		if [ ! -f $OWNCLOUD_PATH/config/config.sample.php ]; then
6531
+			echo $'No owncloud configuration sample file found'
6532
+			exit 54289
6533
+		fi
6534
+		cp $OWNCLOUD_PATH/config/config.sample.php $OWNCLOUD_PATH/config/config.php
6535
+		chown root:root $OWNCLOUD_PATH/config/config.php
6536
+	fi
6537
+
6538
+	if [ -f $OWNCLOUD_UPGRADE_PATH/config/config.php ]; then
6539
+		OWNCLOUD_INSTANCE_ID=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "instanceid" | awk -F "'" '{print $4}')
6540
+		OWNCLOUD_PASSWORD_SALT=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "passwordsalt" | awk -F "'" '{print $4}')
6541
+		OWNCLOUD_DATA_DIR=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "datadirectory" | awk -F "'" '{print $4}')
6542
+		OWNCLOUD_DBTYPE=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "dbtype" | awk -F "'" '{print $4}')
6543
+		OWNCLOUD_DBNAME=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "dbname" | awk -F "'" '{print $4}')
6544
+		OWNCLOUD_DBHOST=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "dbhost" | awk -F "'" '{print $4}')
6545
+		OWNCLOUD_DBUSER=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "dbuser" | awk -F "'" '{print $4}')
6546
+		OWNCLOUD_DBPASS=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "dbpassword" | awk -F "'" '{print $4}')
6547
+		OWNCLOUD_SECRET=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "secret" | awk -F "'" '{print $4}')
6548
+
6549
+		sed -i "s|'instanceid'.*|'instanceid' => '$OWNCLOUD_INSTANCE_ID',|g" $OWNCLOUD_PATH/config/config.php
6550
+		sed -i "s|'passwordsalt'.*|'passwordsalt' => '$OWNCLOUD_PASSWORD_SALT',|g" $OWNCLOUD_PATH/config/config.php
6551
+		sed -i "s|'datadirectory'.*|'datadirectory' => '$OWNCLOUD_DATA_DIR',|g" $OWNCLOUD_PATH/config/config.php
6552
+		sed -i "s|'dbtype'.*|'dbtype' => '$OWNCLOUD_DBTYPE',|g" $OWNCLOUD_PATH/config/config.php
6553
+		sed -i "s|'dbname'.*|'dbname' => '$OWNCLOUD_DBNAME',|g" $OWNCLOUD_PATH/config/config.php
6554
+		sed -i "s|'dbhost'.*|'dbhost' => '$OWNCLOUD_DBHOST',|g" $OWNCLOUD_PATH/config/config.php
6555
+		sed -i "s|'dbuser'.*|'dbuser' => '$OWNCLOUD_DBUSER',|g" $OWNCLOUD_PATH/config/config.php
6556
+		sed -i "s|'dbpassword'.*|'dbpassword' => '$OWNCLOUD_DBPASS',|g" $OWNCLOUD_PATH/config/config.php
6557
+		sed -i "s|'secret'.*|'secret' => '$OWNCLOUD_SECRET',|g" $OWNCLOUD_PATH/config/config.php
6558
+	fi
6559
+
6560
+	# re-index the files
6561
+	for d in /home/*/ ; do
6562
+		USRNAME=$(echo "$d" | awk -F '/' '{print $3}')
6563
+		if [[ $USRNAME != "git" && $USRNAME != "mirrors" ]]; then
6564
+			$OWNCLOUD_PATH/occ files:scan $USRNAME
6565
+		fi
6566
+	done
6567
+
6568
+	# remove the temporary upgrade
6569
+	rm -rf $OWNCLOUD_UPGRADE_PATH
6568 6570
 }
6569 6571
 
6570 6572
 function install_owncloud_official_deb {
@@ -6884,6 +6886,7 @@ function install_owncloud_official_deb {
6884 6886
             exit 54289
6885 6887
         fi
6886 6888
         cp $OWNCLOUD_PATH/config/config.sample.php $OWNCLOUD_PATH/config/config.php
6889
+		chown root:root $OWNCLOUD_PATH/config/config.php
6887 6890
     fi
6888 6891
 
6889 6892
     if [ -f $OWNCLOUD_PATH/config/config.php ]; then