Fix upgrade

check_process

@@ -10,8 +10,8 @@
         setup_private=1
         setup_public=0
         upgrade=1
-        upgrade=1   from_commit=355b24ea0cd3467d7ba1390ab7d34dd4b2500229
-        upgrade=1   from_commit=1fc458110660ce775f7613091cde3c5fdcfbe4e6
+        upgrade=1   from_commit=623d8a30453a26ee21aa2ce1142674a2ffdb85b9
+        upgrade=1   from_commit=73aa672346e40fc1857aef7441c449f0bd322082
         backup_restore=1
         multi_instance=0
         incorrect_path=1
@@ -30,4 +30,4 @@
     Level 10=0
 ;;; Options
 Email=pitchum@gramaton.org
-Notification=down
+Notification=down

scripts/upgrade

@@ -31,12 +31,16 @@ if [ -f /etc/nginx/conf.d/${domain}.d/vpnadmin.conf ]; then
   ynh_replace_string "vpnadmin.sock" "${app}.sock" "/etc/nginx/conf.d/${domain}.d/vpnadmin.conf"
   mv /etc/nginx/conf.d/${domain}.d/vpnadmin.conf /etc/nginx/conf.d/${domain}.d/${app}.conf
 fi
+
 if [ -f /etc/php5/fpm/pool.d/vpnadmin.conf ]; then
-  ynh_replace_string "/var/www/vpnadmin/" "/var/www/${app}/" /etc/php/7.0/fpm/pool.d/vpnadmin.conf
-  ynh_replace_string "vpnadmin.sock" "${app}.sock"  /etc/php/7.0/fpm/pool.d/vpnadmin.conf
+  ynh_replace_string "/var/www/vpnadmin/" "/var/www/${app}/" /etc/php5/fpm/pool.d/vpnadmin.conf
+  ynh_replace_string "vpnadmin.sock" "${app}.sock"  /etc/php5/fpm/pool.d/vpnadmin.conf
   mv /etc/php5/fpm/pool.d/vpnadmin.conf /etc/php/7.0/fpm/pool.d/${app}.conf
 fi
-test -d /var/www/vpnadmin && mv /var/www/vpnadmin /var/www/${app}
+
+if [ -d /var/www/vpnadmin ]; then
+  mv /var/www/vpnadmin /var/www/${app}
+fi
 
 ## Versions known to have a buggy backup script
 #buggy_versions="1.0.0 1.0.1 1.1.0"