From f56c8f267688385bea7b8e4410935d303f68ac03 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Tue, 14 Mar 2017 15:27:44 +0100 Subject: [PATCH] =?UTF-8?q?Corrige=20la=20b=C3=AAtise=20sur=20la=20v=C3=A9?= =?UTF-8?q?rif=20des=20fichiers=20de=20conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index fe15365..e90e5c6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,26 +27,26 @@ if [ -d $final_path ]; then fi # Check configuration files nginx -nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" +nginx_conf="/etc/nginx/conf.d/${domain}.d/nginx.conf" if [ -f $nginx_conf ]; then ynh_die "The NGINX configuration already exists at '${nginx_conf}'. You should safely delete it before restoring this app." # Check configuration files php-fpm -phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" +phpfpm_conf="/etc/php5/fpm/pool.d/php-fpm.conf" if [ -f $phpfpm_conf ]; then ynh_die "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app." fi -phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" +phpfpm_ini="/etc/php5/fpm/conf.d/php-fpm.ini" if [ -f $phpfpm_ini ]; then ynh_die "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app." fi - # Restore sources & data -sudo cp -a ./sources "$final_path" +# Restore sources & data +sudo cp -a ./sources "${final_path}" # Set permissions -sudo chown -R www-data: "$final_path" +sudo chown -R www-data: "${final_path}" # Restore db # if [[ $with_mysql -eq 1 ]]; then @@ -60,10 +60,10 @@ sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php # fi # Restore nginx configuration files -sudo cp -a ./nginx.conf "$nginx_conf" +sudo cp -a ./nginx.conf "${nginx_conf}" # Restore php-fpm configuration files -sudo cp -a ./php-fpm.conf "$phpfpm_conf" -sudo cp -a ./php-fpm.ini "$phpfpm_ini" +sudo cp -a ./php-fpm.conf "${phpfpm_conf}" +sudo cp -a ./php-fpm.ini "${phpfpm_ini}" # Reload services sudo service nginx reload