diff --git a/scripts/backup b/scripts/backup index 13d9e32..61018f9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -3,12 +3,12 @@ # Exit on command errors and treat unset variables as an error set -eu -# Get multi-instances specific variables -app=$YNH_APP_INSTANCE_NAME - # Source app helpers source /usr/share/yunohost/helpers +# Get multi-instances specific variables +app=$YNH_APP_INSTANCE_NAME + # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) diff --git a/scripts/remove b/scripts/remove index 95e828e..8317d32 100644 --- a/scripts/remove +++ b/scripts/remove @@ -3,12 +3,12 @@ # Exit on command errors and treat unset variables as an error set -u +# Source app helpers +source /usr/share/yunohost/helpers + # Get multi-instances specific variables app=$YNH_APP_INSTANCE_NAME -# Source app helpers -. /usr/share/yunohost/helpers - # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) # with_mysql=$(ynh_app_setting_get "$app" with_mysql) diff --git a/scripts/restore b/scripts/restore index f9faed7..79de2bf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -4,12 +4,12 @@ # Exit on command errors and treat unset variables as an error set -eu -# The parameter $app is the id of the app instance ex: ynhexample__2 -app=$YNH_APP_INSTANCE_NAME - # Source app helpers source /usr/share/yunohost/helpers +# The parameter $app is the id of the app instance ex: ynhexample__2 +app=$YNH_APP_INSTANCE_NAME + # Get old parameter of the app domain=$(ynh_app_setting_get $app domain) path=$(ynh_app_setting_get $app path) @@ -27,17 +27,17 @@ if [ -d $final_path ]; then fi # Check configuration files nginx -nginx_conf="/etc/nginx/conf.d/${domain}.d/nginx.conf" +nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" if [ -f $nginx_conf ]; then ynh_die "The NGINX configuration already exists at '${nginx_conf}'. You should safely delete it before restoring this app." fi # Check configuration files php-fpm -phpfpm_conf="/etc/php5/fpm/pool.d/php-fpm.conf" +phpfpm_conf="/etc/php5/fpm/pool.d/php-fpm-${app}.conf" if [ -f $phpfpm_conf ]; then ynh_die "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app." fi -phpfpm_ini="/etc/php5/fpm/conf.d/php-fpm.ini" +phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini" if [ -f $phpfpm_ini ]; then ynh_die "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app." fi @@ -68,4 +68,4 @@ sudo cp -a ./php-fpm.ini "${phpfpm_ini}" # Reload services sudo systemctl reload php5-fpm sudo systemctl reload nginx -sudo yunohost app ssowatconf +sudo yunohost app ssowatconf \ No newline at end of file