From db70fd9b4424135211229cbcbf6ce302248c0fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Jan 2021 12:19:18 +0100 Subject: [PATCH 1/4] Set badge to SVG --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 230355b..6f23804 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # h5ai pour YunoHost [![Integration level](https://dash.yunohost.org/integration/h5ai.svg)](https://dash.yunohost.org/appci/app/h5ai) ![](https://ci-apps.yunohost.org/ci/badges/h5ai.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/h5ai.maintain.svg) -[![Installer h5ai avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=h5ai) +[![Installer h5ai avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=h5ai) *[Read this readme in english.](./README.md)* From dbf9bef843ca2af05759ebc07a9a05d464cae7e3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 2 Feb 2021 10:55:41 +0100 Subject: [PATCH 2/4] Upgrade to version 0.30.0 --- README.md | 2 +- README_fr.md | 2 +- check_process | 1 - conf/app.src | 6 +++--- manifest.json | 4 ++-- pull_request_template.md | 4 +--- scripts/install | 4 ++-- scripts/upgrade | 7 +++++++ 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0d368ee..e91ce98 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview [h5ai](https://larsjung.de/h5ai/) is a modern file indexer for HTTP web servers. It allows to display and browse directories containing various documents with a clean and light interface. -**Shipped version:** 0.29.2 +**Shipped version:** 0.30.0 Screenshot : diff --git a/README_fr.md b/README_fr.md index 6f23804..c385ac9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble [h5ai](https://larsjung.de/h5ai/) est un indexeur de fichiers moderne pour les serveurs Web HTTP. Il permet d'afficher et de parcourir des répertoires contenant divers documents avec une interface légère et claire. -**Version incluse :** 0.29.2 +**Version incluse :** 0.30.0 ## Captures d'écran diff --git a/check_process b/check_process index 8bb191c..e974d07 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,6 @@ upgrade=1 from_commit=73f74039fb63adc555222d73ded6b43a64d41456 backup_restore=1 multi_instance=0 - incorrect_path=1 port_already_use=0 change_url=1 ;;; Options diff --git a/conf/app.src b/conf/app.src index 290b95b..13f1e9f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://release.larsjung.de/h5ai/h5ai-0.29.2.zip -SOURCE_SUM=612acd8cc724ab42c5266f7b9966a0212b561331d8770b5609891edb5cb69a8b +SOURCE_URL=https://release.larsjung.de/h5ai/h5ai-0.30.0.zip +SOURCE_SUM=fe138305a61d72094beb8c507dab728020158e4b00dae695a60b9803babb3e30 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=h5ai-0.29.2.zip +SOURCE_FILENAME=h5ai-0.30.0.zip diff --git a/manifest.json b/manifest.json index 411d33f..73e1119 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.29.2~ynh3", + "version": "0.30.0~ynh1", "url": "https://larsjung.de/h5ai/", "license": "MIT", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": false, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ diff --git a/pull_request_template.md b/pull_request_template.md index 9eefc77..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/h5ai_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/h5ai_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 58be67e..ea8a1db 100644 --- a/scripts/install +++ b/scripts/install @@ -88,14 +88,14 @@ chown -R $app: "$final_path" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then # Everyone can access the app. # The "main" permission is automatically created before the install script. - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 366ff9d..fd2bb1b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,6 +53,13 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From f6e49dcef8a3145813ffc0b90e5478e0215c0bec Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 2 Feb 2021 15:54:24 +0100 Subject: [PATCH 3/4] Fix misc stuff in check_process --- check_process | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/check_process b/check_process index e974d07..d9145d6 100644 --- a/check_process +++ b/check_process @@ -8,7 +8,7 @@ ; Checks pkg_linter=1 setup_sub_dir=1 - setup_root=0 + setup_root=1 setup_nourl=0 setup_private=1 setup_public=1 @@ -18,9 +18,6 @@ multi_instance=0 port_already_use=0 change_url=1 -;;; Options -Email=alex.aubin@mailoo.org -Notification=down ;;; Upgrade options ; commit=73f74039fb63adc555222d73ded6b43a64d41456 name=Update check_process, 24 Jun 2019 From 4bd0791fd9a2b39840ccfb1dd56abe16d5545b44 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 2 Feb 2021 16:42:44 +0100 Subject: [PATCH 4/4] Set requirements to 4.0.0 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 73e1119..e85e1e9 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "alex.aubin@mailoo.org" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.0.0" }, "multi_instance": false, "services": [