Browse Source

Remove conf from version < 1.2.0

ericgaspar 4 years ago
parent
commit
41b59ba7b8
1 changed files with 3 additions and 11 deletions
  1. 3 11
      scripts/upgrade

+ 3 - 11
scripts/upgrade

@@ -25,18 +25,10 @@ final_path=$(ynh_app_setting_get $app final_path)
 # SPECIAL UPGRADE FOR VERSIONS < 1.2.0
 #=================================================
 
-# Apply renaming that occured in v1.2.0 ("vpnadmin" -> "${app}")
-if [ -f /etc/nginx/conf.d/${domain}.d/vpnadmin.conf ]; then
-  ynh_replace_string "/var/www/vpnadmin/" "/var/www/${app}/" "/etc/nginx/conf.d/${domain}.d/vpnadmin.conf"
-  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
+# Removing config files with naming that occured in versions < 1.2.0 ("vpnadmin" instead off "$app")
+rm /etc/nginx/conf.d/${domain}.d/vpnadmin.conf 2>/dev/null 
 
-if [ -f /etc/php/$YNH_PHP_VERSION/fpm/pool.d/vpnadmin.conf ]; then
-  ynh_replace_string "/var/www/vpnadmin/" "/var/www/${app}/" /etc/php/$YNH_PHP_VERSION/fpm/pool.d/vpnadmin.conf
-  ynh_replace_string "vpnadmin.sock" "${app}.sock"  /etc/php/$YNH_PHP_VERSION/fpm/pool.d/vpnadmin.conf
-  mv /etc/php/$YNH_PHP_VERSION/fpm/pool.d/vpnadmin.conf /etc/php/$YNH_PHP_VERSION/fpm/pool.d/${app}.conf
-fi
+rm -f /etc/php/*/fpm/pool.d/vpnadmin.conf 2>/dev/null 
 
 if [ -d /var/www/vpnadmin ]; then
   mv /var/www/vpnadmin /var/www/${app}