From 456d957c98741373cdacfe98eed615c51c512d90 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 8 Aug 2021 14:29:32 +0200 Subject: [PATCH 1/6] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index daaa3d1..c96bc07 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "h5ai", "packaging_format": 1, "description": { - "en": "Modern HTTP web server index for NGINX.", - "fr": "Serveur moderne d'index pour NGINX." + "en": "Modern HTTP web server index for NGINX", + "fr": "Serveur moderne d'index pour NGINX" }, "version": "0.30.0~ynh2", "url": "https://larsjung.de/h5ai/", From 215d6ebf3a0d1337f43425da9daeca9269ae17fa Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 8 Aug 2021 12:29:36 +0000 Subject: [PATCH 2/6] 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 c41ef2c..8f2cfaf 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Modern HTTP web server index for NGINX. +Modern HTTP web server index for NGINX **Shipped version:** 0.30.0~ynh2 diff --git a/README_fr.md b/README_fr.md index 1cb536d..8d558f4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Serveur moderne d'index pour NGINX. +Serveur moderne d'index pour NGINX **Version incluse :** 0.30.0~ynh2 From 0b0f2b30072fd7e41bf7a59a9dcc8adac5535ff7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Sep 2021 23:38:12 +0200 Subject: [PATCH 3/6] Cleaning up --- manifest.json | 3 +-- scripts/restore | 2 -- scripts/upgrade | 28 ++++++++++++++-------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/manifest.json b/manifest.json index c96bc07..a867dd2 100644 --- a/manifest.json +++ b/manifest.json @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index 8dd74e8..aa8b395 100644 --- a/scripts/restore +++ b/scripts/restore @@ -31,8 +31,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index facb0ac..8bd5203 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -32,6 +32,20 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +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 +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -57,20 +71,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." - # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -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 -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From f8a772c0a22ad688e828bc1d1e6b540d939f3fdf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Nov 2021 13:06:49 +0100 Subject: [PATCH 4/6] Update to 4.3 --- conf/app.src | 2 +- conf/nginx.conf | 4 ---- manifest.json | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/conf/app.src b/conf/app.src index 13f1e9f..2c6471e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,4 +3,4 @@ SOURCE_SUM=fe138305a61d72094beb8c507dab728020158e4b00dae695a60b9803babb3e30 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=h5ai-0.30.0.zip +SOURCE_FILENAME=h5ai.zip diff --git a/conf/nginx.conf b/conf/nginx.conf index 24409ba..93dc9d7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,10 +12,6 @@ location __PATH__/ { client_max_body_size 10G; - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm.sock; diff --git a/manifest.json b/manifest.json index a867dd2..d3fa06e 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "email": "alex.aubin@mailoo.org" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ From 1e635e5eaa7df827f76092cf6df3e28218fc955a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Nov 2021 15:31:31 +0100 Subject: [PATCH 5/6] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d3fa06e..ed536db 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern HTTP web server index for NGINX", "fr": "Serveur moderne d'index pour NGINX" }, - "version": "0.30.0~ynh2", + "version": "0.30.0~ynh3", "url": "https://larsjung.de/h5ai/", "upstream": { "license": "MIT", From 1e1c5b3a831bf159be1e1ab8f3e08889871a0fc7 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 29 Nov 2021 14:31:34 +0000 Subject: [PATCH 6/6] 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 8f2cfaf..0d41372 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Modern HTTP web server index for NGINX -**Shipped version:** 0.30.0~ynh2 +**Shipped version:** 0.30.0~ynh3 diff --git a/README_fr.md b/README_fr.md index 8d558f4..0eea75c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur moderne d'index pour NGINX -**Version incluse :** 0.30.0~ynh2 +**Version incluse :** 0.30.0~ynh3