From e279bce875ccf249207f573833c557ae945dd91c Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 25 Jun 2017 20:50:07 +0100 Subject: [PATCH] Set database password on movim restore --- src/freedombone-app-lychee | 2 +- src/freedombone-app-mediagoblin | 2 +- src/freedombone-app-movim | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-lychee b/src/freedombone-app-lychee index 912e4562..b0e3de1f 100755 --- a/src/freedombone-app-lychee +++ b/src/freedombone-app-lychee @@ -13,7 +13,7 @@ # License # ======= # -# Copyright (C) 2014-2016 Bob Mottram +# Copyright (C) 2014-2017 Bob Mottram # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin index 22593f7e..da8d5305 100755 --- a/src/freedombone-app-mediagoblin +++ b/src/freedombone-app-mediagoblin @@ -13,7 +13,7 @@ # License # ======= # -# Copyright (C) 2016 Bob Mottram +# Copyright (C) 2016-2017 Bob Mottram # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim index 3b2e3eff..3747f1a1 100755 --- a/src/freedombone-app-movim +++ b/src/freedombone-app-movim @@ -216,6 +216,11 @@ function restore_local_movim { rm -rf $temp_restore_dir fi + MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb) + cd /var/www/$MOVIM_DOMAIN_NAME/htdocs/config + sed -i "s|'password'.*|'password' => '$MARIADB_PASSWORD',|g" db.inc.php + MARIADB_PASSWORD= + echo $"Restore of movim complete" fi } @@ -259,6 +264,12 @@ function restore_remote_movim { if [ -d /root/tempmovim ]; then rm -rf /root/tempmovim fi + + MARIADB_PASSWORD=$(${PROJECT_NAME}-pass -u root -a mariadb) + cd /var/www/$MOVIM_DOMAIN_NAME/htdocs/config + sed -i "s|'password'.*|'password' => '$MARIADB_PASSWORD',|g" db.inc.php + MARIADB_PASSWORD= + echo $"Restore of movim complete" fi }