Explorar o código

Supprimer les || true au démarrage des services

magikcypress %!s(int64=8) %!d(string=hai) anos
pai
achega
69a03d61ed
Modificáronse 3 ficheiros con 10 adicións e 4 borrados
  1. 2 2
      scripts/remove
  2. 2 2
      scripts/restore
  3. 6 0
      scripts/upgrade

+ 2 - 2
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
 

+ 2 - 2
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
+sudo service php5-fpm reload
+sudo service nginx reload

+ 6 - 0
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