From 685140d800a6cbabaf0b1f8bec502c4e1d8a4f1f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Nov 2021 10:06:41 +0100 Subject: [PATCH 1/4] Update remove --- scripts/remove | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/remove b/scripts/remove index 5254aeb..4644a96 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,6 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # STANDARD REMOVE @@ -57,6 +58,17 @@ ynh_script_progression --message="Removing app main directory and database..." - # 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 #================================================= From 36555b14caba6e9ead9ba14d3eab2cb1f3c89a37 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Nov 2021 22:30:43 +0100 Subject: [PATCH 2/4] Update nginx.conf --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 02a7d09..c668a7a 100644 --- 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_redirect off; proxy_set_header Host $host; From 8519f61045fe92a5b24a34266b6e920e0c71ba3f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Nov 2021 06:14:34 +0000 Subject: [PATCH 3/4] Upgrade to v0.132.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 5028596..fa75ceb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/gotson/komga/releases/download/v0.132.1/komga-0.132.1.jar -SOURCE_SUM=6520fcbb8944fa3b1aa3c9221da9a05bda46c9b5c63f8b294359a824b25c61d2 +SOURCE_URL=https://github.com/gotson/komga/releases/download/v0.132.2/komga-0.132.2.jar +SOURCE_SUM=001b8ebd798799fadd2d2947e6994f0ed32ec7f13265ae4c9f7992f073fe1b13 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=jar SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 00d863e..2620362 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media server for your comics, manga and magazines", "fr": "Serveur multimédia pour vos bandes dessinées, mangas et magazines" }, - "version": "0.132.1~ynh1", + "version": "0.132.2~ynh1", "url": "https://komga.org", "upstream": { "license": "MIT", From f70942947e685273c8b7e21009d880a3a466e295 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 17 Nov 2021 06:14:39 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0233639..1bfd265 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Komga is a free and open source comics/mangas server. - Download book files -**Shipped version:** 0.132.1~ynh1 +**Shipped version:** 0.132.2~ynh1 **Demo:** https://demo.komga.org diff --git a/README_fr.md b/README_fr.md index 616027b..60d34f8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Komga is a free and open source comics/mangas server. - Download book files -**Version incluse :** 0.132.1~ynh1 +**Version incluse :** 0.132.2~ynh1 **Démo :** https://demo.komga.org