diff options
| author | nachoparker <nacho@ownyourbits.com> | 2017-08-10 01:56:35 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2017-08-11 00:17:56 +0300 |
| commit | 3dd9945fd64e9b1049dfe0fe7b87239c8465b0ab (patch) | |
| tree | 21fae5fcadc25d9d316e546a496730b879857ea0 | |
| parent | a6b79b433f3bd99196b0360c167d5ec9bf6af3d6 (diff) | |
restore from other instance fixv0.19.2
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-init.sh | 2 | ||||
| -rw-r--r-- | etc/nextcloudpi-config.d/nc-restore.sh | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/etc/nextcloudpi-config.d/nc-init.sh b/etc/nextcloudpi-config.d/nc-init.sh index b0107e0a..77430b42 100644 --- a/etc/nextcloudpi-config.d/nc-init.sh +++ b/etc/nextcloudpi-config.d/nc-init.sh @@ -49,7 +49,7 @@ configure() # workaround to emulate DROP USER IF EXISTS ..;) local DBPASSWD=$( grep password /root/.my.cnf | cut -d= -f2 ) - mysql -u root -p$DBPASSWD <<EOF + mysql -u root <<EOF DROP DATABASE IF EXISTS nextcloud; CREATE DATABASE nextcloud CHARACTER SET utf8mb4 diff --git a/etc/nextcloudpi-config.d/nc-restore.sh b/etc/nextcloudpi-config.d/nc-restore.sh index 4d79810d..5b320303 100644 --- a/etc/nextcloudpi-config.d/nc-restore.sh +++ b/etc/nextcloudpi-config.d/nc-restore.sh @@ -57,7 +57,7 @@ configure() local DBPASSWD=$( grep password /root/.my.cnf | cut -d= -f2 ) echo -e "restore database..." - mysql -u root -p$DBPASSWD <<EOF + mysql -u root <<EOF DROP DATABASE IF EXISTS nextcloud; CREATE DATABASE nextcloud; GRANT USAGE ON *.* TO '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD'; @@ -68,7 +68,7 @@ EXIT EOF [ $? -ne 0 ] && { echo -e "Error configuring nextcloud database"; return 1; } - mysql -u root -p$DBPASSWD nextcloud < "$TMPDIR"/nextcloud-sqlbkp_*.bak || { echo -e "Error restoring nextcloud database"; return 1; } + mysql -u root nextcloud < "$TMPDIR"/nextcloud-sqlbkp_*.bak || { echo -e "Error restoring nextcloud database"; return 1; } ## RESTORE DATADIR @@ -89,7 +89,7 @@ EOF else echo -e "no datadir found in backup" - sed -i "s|'datadirectory' =>.*|'datadirectory' => '/var/www/nextcloud/data',|" "config/config.php" + sed -i "s|'datadirectory' =>.*|'datadirectory' => '/var/www/nextcloud/data',|" config/config.php sudo -u www-data php occ maintenance:mode --off sudo -u www-data php occ files:scan --all @@ -106,6 +106,9 @@ EOF fi rm -r "$TMPDIR" + # update NC database password to this instance + sed -i "s|'dbpassword' =>.*|'dbpassword' => '$DBPASSWD',|" config/config.php + # Just in case we moved the opcache dir sed -i "s|^opcache.file_cache=.*|opcache.file_cache=$BASEDIR/nextcloud/data/.opcache|" /etc/php/7.0/mods-available/opcache.ini } |