Always use the owncloud sample config

This commit is contained in:
Bob Mottram 2016-03-12 14:49:20 +00:00
parent bd327011dc
commit 105d8f0077
1 changed files with 4 additions and 8 deletions

View File

@ -6531,14 +6531,11 @@ function upgrade_owncloud_finish {
cp -r $OWNCLOUD_UPGRADE_PATH/data/* $OWNCLOUD_PATH/data/
chown -R www-data:www-data $OWNCLOUD_PATH/data
if [ ! -f $OWNCLOUD_PATH/config/config.php ]; then
if [ ! -f $OWNCLOUD_PATH/config/config.sample.php ]; then
echo $'No owncloud configuration sample file found'
exit 54289
fi
cp $OWNCLOUD_PATH/config/config.sample.php $OWNCLOUD_PATH/config/config.php
chown root:root $OWNCLOUD_PATH/config/config.php
if [ ! -f $OWNCLOUD_PATH/config/config.sample.php ]; then
echo $'No owncloud configuration sample file found'
exit 54289
fi
cp $OWNCLOUD_PATH/config/config.sample.php $OWNCLOUD_PATH/config/config.php
if [ -f $OWNCLOUD_UPGRADE_PATH/config/config.php ]; then
OWNCLOUD_INSTANCE_ID=$(cat $OWNCLOUD_UPGRADE_PATH/config/config.php | grep "instanceid" | awk -F "'" '{print $4}')
@ -6563,7 +6560,6 @@ function upgrade_owncloud_finish {
sed -i "s|'installed'.*|'secret' => true,|g" $OWNCLOUD_PATH/config/config.php
fi
cp $OWNCLOUD_PATH/config/config.php $OWNCLOUD_PATH/config/config.upgrade
chown root:root $OWNCLOUD_PATH/config/config.php
# re-index the files