From aa44568e7b2e370a8fb2d3f1a440581ef8254cf4 Mon Sep 17 00:00:00 2001 From: magikcypress Date: Sat, 3 Jun 2017 16:37:08 +0200 Subject: [PATCH] [fix] Delete lines for php5-fpm config restore --- conf/nginx.conf | 2 +- scripts/restore | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 01812cd..026b928 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ location __PATH__ { - alias __FINALPATH__; + alias __FINALPATH__/; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } diff --git a/scripts/restore b/scripts/restore index 9347448..1b382c8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,12 +70,9 @@ sudo chmod -R 700 $final_path/{data,tmp} # Restore nginx configuration files sudo cp -a ./conf/nginx.conf "${nginx_conf}" -sudo cp -a ./php-fpm.conf "$phpfpm_conf" -sudo cp -a ./php-fpm.ini "$phpfpm_ini" - # Restore php-fpm configuration files -sudo cp -a ./conf/php-fpm.conf "${phpfpm_conf}" -sudo cp -a ./conf/php-fpm.ini "${phpfpm_ini}" +sudo cp -a ./php-fpm.conf "${phpfpm_conf}" +sudo cp -a ./php-fpm.ini "${phpfpm_ini}" # Set ssowat config if [ "$is_public" = "Yes" ];