diff --git a/README.md b/README.md index c49d936..e0fab76 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ n8n is an extendable workflow automation tool. With a fair-code distribution mod **Shipped version:** 0.153.0~ynh1 -**Demo:** https://demo.example.com + ## Screenshots diff --git a/README_fr.md b/README_fr.md index d982866..56d260b 100755 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ n8n is an extendable workflow automation tool. With a fair-code distribution mod **Version incluse :** 0.153.0~ynh1 -**Démo :** https://demo.example.com + ## Captures d'écran diff --git a/conf/nginx.conf b/conf/nginx.conf index e6279cf..131d238 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__/; proxy_set_header Host $host; proxy_pass_header Server; diff --git a/manifest.json b/manifest.json index 714554a..480184b 100755 --- a/manifest.json +++ b/manifest.json @@ -11,7 +11,6 @@ "upstream": { "license": "Apache-2.0-with-commons-clause", "website": "https://n8n.io/", - "demo": "https://demo.example.com", "admindoc": "https://docs.n8n.io/", "code": "https://github.com/n8n-io/n8n" }, @@ -20,7 +19,7 @@ "name": "fflorent" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index e4c7965..30a9c87 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -nodejs_version=14 +nodejs_version=16 -n8n_version=0.138.0 +n8n_version=0.159.1 #================================================= # PERSONAL HELPERS diff --git a/scripts/remove b/scripts/remove index 577b97f..8c51903 100755 --- a/scripts/remove +++ b/scripts/remove @@ -21,6 +21,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # STANDARD REMOVE @@ -67,6 +68,17 @@ ynh_script_progression --message="Removing $app main directory..." --weight=3 # Remove the app directory securely ynh_secure_remove --file="$final_path" +#================================================= +# REMOVE DATA DIR +#================================================= + +# Remove the data directory if --purge option is used +if [ "${YNH_APP_PURGE:-0}" -eq 1 ] +then + ynh_script_progression --message="Removing app data directory..." --weight=1 + ynh_secure_remove --file="$datadir" +fi + #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 4de43ee..7d4a9f0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS