From d969a2449d967d46fd2f195ce783c3b938e07efd Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Tue, 7 Feb 2017 18:06:03 +0100 Subject: [PATCH] [enh] Update restore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Vérifications $final_path et conf nginx - Et php-fpm... --- scripts/restore | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/restore b/scripts/restore index 93169e9..6343800 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,10 @@ path_url=$(ynh_app_setting_get "$app" path_url) sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \ || ynh_die "Path not available: ${domain}${path_url}" +if [ -d $final_path ]; then + ynh_die "There is already a directory: $final_path" +fi + # Restore sources & data src_path="/var/www/${app}" sudo cp -a ./sources "$src_path" @@ -39,14 +43,18 @@ sudo chown -R root: "$src_path" ### MySQL end ### # Restore NGINX configuration -sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf" +nginx_conf=/etc/nginx/conf.d/${domain}.d/${app}.conf +if [ -f $nginx_conf ]; then + ynh_die "There is already a nginx conf file at this path: $nginx_conf" +fi +sudo cp -a ./nginx.conf "$nginx_conf" + +# Reload Nginx +sudo service nginx reload ### PHP (remove if not used) ### # If a dedicated php-fpm process is used: # # Copy PHP-FPM pool configuration and reload the service -# sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" -# sudo service php5-fpm reload +sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" +sudo service php5-fpm reload ### PHP end ### - -# Restart webserver -sudo service nginx reload