YunoHost-Apps/cac-proxy_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/cac-proxy_ynh.git synced 2024-09-03 18:16:07 +02:00
Code Issues Activity Actions

Merge pull request #14 from YunoHost-Apps/main

Browse source 
Merging fix from main to master
This commit is contained in:
Gérard Collin 2023-09-28 11:57:11 +02:00 committed by GitHub
commit c48e3db082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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 - 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 ## Screenshots

2
README_fr.md
View file

@ -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 - 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 ## Captures d’écran

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "An advanced https proxy allowing you to call other websites from your own web application.", "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." "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", "url": "https://github.com/gcollin/cookie-aware-cors-proxy",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",

5
scripts/backup
View file

@ -30,6 +30,7 @@ app=$YNH_APP_INSTANCE_NAME
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
domain=$(ynh_app_setting_get --app=$app --key=domain) 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 # 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 # SPECIFIC BACKUP
#================================================= #=================================================
if [ -n "$public_key" ]
then
ynh_backup --src_path="/etc/sudoers.d/$app-sudoers" ynh_backup --src_path="/etc/sudoers.d/$app-sudoers"
fi
# BACKUP LOGROTATE # BACKUP LOGROTATE
#================================================= #=================================================

14
scripts/upgrade
View file

@ -38,6 +38,12 @@ upgrade_type=$(ynh_check_app_version_changed)
#================================================= #=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP # 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 ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
# Backup the current version of the app # Backup the current version of the app
@ -46,9 +52,17 @@ ynh_clean_setup () {
# Restore it if the upgrade fails # Restore it if the upgrade fails
ynh_restore_upgradebackup 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 # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================