|
@@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get $app domain)
|
|
|
path_url=$(ynh_app_setting_get $app path)
|
|
|
is_public=$(ynh_app_setting_get $app is_public)
|
|
|
final_path=$(ynh_app_setting_get $app final_path)
|
|
|
-phpversion=$(ynh_app_setting_get $app phpversion)
|
|
|
|
|
|
#=================================================
|
|
|
# SPECIAL UPGRADE FOR VERSIONS < 1.2.0
|
|
@@ -33,10 +32,10 @@ if [ -f /etc/nginx/conf.d/${domain}.d/vpnadmin.conf ]; then
|
|
|
mv /etc/nginx/conf.d/${domain}.d/vpnadmin.conf /etc/nginx/conf.d/${domain}.d/${app}.conf
|
|
|
fi
|
|
|
|
|
|
-if [ -f /etc/php/$phpversion/fpm/pool.d/vpnadmin.conf ]; then
|
|
|
- ynh_replace_string "/var/www/vpnadmin/" "/var/www/${app}/" /etc/php/$phpversion/fpm/pool.d/vpnadmin.conf
|
|
|
- ynh_replace_string "vpnadmin.sock" "${app}.sock" /etc/php/$phpversion/fpm/pool.d/vpnadmin.conf
|
|
|
- mv /etc/php/$phpversion/fpm/pool.d/vpnadmin.conf /etc/php/$phpversion/fpm/pool.d/${app}.conf
|
|
|
+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
|
|
|
|
|
|
if [ -d /var/www/vpnadmin ]; then
|