From 69a03d61ed2229a6079842ab18f005c4525d6f7c Mon Sep 17 00:00:00 2001 From: magikcypress Date: Sun, 26 Mar 2017 16:18:56 +0200 Subject: [PATCH] =?UTF-8?q?Supprimer=20les=20||=20true=20au=20d=C3=A9marra?= =?UTF-8?q?ge=20des=20services?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/remove b/scripts/remove index 076fecf..52a0795 100644 --- a/scripts/remove +++ b/scripts/remove @@ -29,6 +29,6 @@ sudo rm -f "/etc/php5/fpm/conf.d/20-${app}.ini" [[ -n $domain ]] && sudo rm -f "/etc/nginx/conf.d/${domain}.d/${app}.conf" # Reload services -sudo service php5-fpm restart || true -sudo service nginx reload || true +sudo service php5-fpm restart +sudo service nginx reload diff --git a/scripts/restore b/scripts/restore index 016e2ce..4b85758 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,5 +64,5 @@ sudo cp -a ./php-fpm.conf "${phpfpm_conf}" sudo cp -a ./php-fpm.ini "${phpfpm_ini}" # Reload services -sudo service php5-fpm reload || true -sudo service nginx reload || true \ No newline at end of file +sudo service php5-fpm reload +sudo service nginx reload \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 1201930..d6c89cf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,6 +28,7 @@ root_pwd=$(sudo cat /etc/yunohost/mysql) final_path=/var/www/$app +# Get source SETUP_SOURCE # Delete install directory after upgrade @@ -45,6 +46,9 @@ then sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf fi +# Create the php-fpm pool config +POOL_FPM + # Setup SSOwat ynh_app_setting_set "$app" is_public "$is_public" if [ "$is_public" = "Yes" ]; @@ -54,3 +58,5 @@ fi # Reload Nginx sudo service nginx reload +sudo service php5-fpm reload +sudo yunohost app ssowatconf \ No newline at end of file