solve conflicts with ubuntu 20 branch

This commit is contained in:
Rauno Moisto
2021-07-13 14:47:20 +03:00
parent 4cb46ea465
commit 03fe2df0a6
12 changed files with 68 additions and 70 deletions
+2 -2
View File
@@ -26,7 +26,7 @@ if [ ! -f $1/config.php ]; then
fi
echo "Restoring backup from $1"
service php7.2-fpm stop
service php7.4-fpm stop
# remove the current ownCloud/Nextcloud installation
rm -rf /usr/local/lib/owncloud/
@@ -45,5 +45,5 @@ chown www-data.www-data $STORAGE_ROOT/owncloud/config.php
sudo -u www-data php /usr/local/lib/owncloud/occ maintenance:mode --off
service php7.2-fpm start
service php7.4-fpm start
echo "Done"