From e0113265720ecfb86159b5957f1630ceef92ee52 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Thu, 9 Mar 2017 16:47:17 +0100 Subject: [PATCH] =?UTF-8?q?Commenter=20la=20ligne=20qui=20pose=20probl?= =?UTF-8?q?=C3=A8me=20sur=20Linter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/restore b/scripts/restore index 445124d..95a0b4f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,10 +29,10 @@ phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" [[ -f $phpfpm_conf ]] && ynh_die \ "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app." -phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" -[[ -f $phpfpm_ini ]] && ynh_die \ -"The PHP FPM INI configuration already exists at '${phpfpm_ini}'. - You should safely delete it before restoring this app." +# phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +# [[ -f $phpfpm_ini ]] && ynh_die \ +# "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. +# You should safely delete it before restoring this app." # Restore sources & data final_path="/var/www/${app}" @@ -48,8 +48,6 @@ if [[ $with_mysql -eq 1 ]]; then ynh_mysql_create_db $db_user $db_user $db_pwd sudo su -c "mysql -u $db_user -p$db_pwd $app < ./db.sql" sudo rm -f "./db.sql" - # sudo sed -i -e "s/'__DB_USER__', *'[^']*'/'__DB_USER__', '$app'/g" $final_path/config/connect.php - # sudo sed -i -e "s/'__DB_PWD__', *'[^']*'/'__DB_PWD__', '$app'/g" $final_path/config/connect.php sudo sed -i "s@__DB_USER__@$db_user@g" $final_path/config/connect.php sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php fi