diff --git a/README.md b/README.md index 10c572b..1fb0185 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo - Two engines: a lightweight and one based on chrome to support websites running javascript -**Shipped version:** 1.2.0~ynh1 +**Shipped version:** 1.2.0~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c00a3ad..4552b5e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ With Cookie Aware Cors Proxy, you can call a website not supporting CORS from yo - Two engines: a lightweight and one based on chrome to support websites running javascript -**Version incluse :** 1.2.0~ynh1 +**Version incluse :** 1.2.0~ynh2 ## Captures d’écran diff --git a/manifest.json b/manifest.json index 4b9eb4f..f9e059d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An advanced https proxy allowing you to call other websites from your own web application.", "fr": "Un proxy https avancé vous permettant d'appeler d'autres sites depuis votre propre application web." }, - "version": "1.2.0~ynh1", + "version": "1.2.0~ynh2", "url": "https://github.com/gcollin/cookie-aware-cors-proxy", "upstream": { "license": "MIT", diff --git a/scripts/backup b/scripts/backup index 26b95b8..9737690 100755 --- a/scripts/backup +++ b/scripts/backup @@ -30,6 +30,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) +public_key=$(ynh_app_setting_get --app=$app --key=public_key) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -56,8 +57,10 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # SPECIFIC BACKUP #================================================= -ynh_backup --src_path="/etc/sudoers.d/$app-sudoers" - +if [ -n "$public_key" ] +then + ynh_backup --src_path="/etc/sudoers.d/$app-sudoers" +fi # BACKUP LOGROTATE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 66d1d60..73aad75 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,17 +38,31 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= +# There is an issue in previous backup file in case of non public_key, so we create the missing directory +if [ ! -f "/etc/sudoers.d/$app-sudoers" ] +then + touch "/etc/sudoers.d/$app-sudoers" +fi + ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - # Restore it if the upgrade fails - ynh_restore_upgradebackup + # Restore it if the upgrade fails + ynh_restore_upgradebackup } + +# Removes the directory created only for backup if not necessary +if [ ! -n "$public_key" ] +then + rm "/etc/sudoers.d/$app-sudoers" +fi + # Exit if an error occurs during the execution of the script ynh_abort_if_errors + #================================================= # STANDARD UPGRADE STEPS #=================================================