From a49e9ac98888fea225b032abff2189d688638339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Jan 2021 09:59:07 +0100 Subject: [PATCH 1/2] Testing (#12) * Add missing PHP variable * Small fixes --- README.md | 2 +- README_fr.md | 2 +- check_process | 3 --- scripts/install | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5a20345..9a1353a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ChtickyNotes for YunoHost [![Integration level](https://dash.yunohost.org/integration/chtickynotes.svg)](https://dash.yunohost.org/appci/app/chtickynotes) ![](https://ci-apps.yunohost.org/ci/badges/chtickynotes.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/chtickynotes.maintain.svg) -[![Install ChtickyNotes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=chtickynotes) +[![Install ChtickyNotes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chtickynotes) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index cb85e56..5f03ad8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # ChtickyNotes pour YunoHost [![Integration level](https://dash.yunohost.org/integration/chtickynotes.svg)](https://dash.yunohost.org/appci/app/chtickynotes) ![](https://ci-apps.yunohost.org/ci/badges/chtickynotes.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/chtickynotes.maintain.svg) -[![Install ChtickyNotes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=chtickynotes) +[![Install ChtickyNotes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=chtickynotes) *[Read this readme in english.](./README.md)* diff --git a/check_process b/check_process index ee1d178..6aa0df3 100644 --- a/check_process +++ b/check_process @@ -20,9 +20,6 @@ multi_instance=0 port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index 50d83cc..d65d16b 100644 --- a/scripts/install +++ b/scripts/install @@ -98,7 +98,7 @@ chown -R $app: $final_path ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Make app public if necessary or protect it -[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors" +[ $is_public -eq 0 ] || ynh_permission_update --permission="main" --add="visitors" #================================================= # RELOAD NGINX From 8755342bd8bb35fc1dc4620f25ac899d89e54f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 20 Feb 2021 16:15:32 +0100 Subject: [PATCH 2/2] Testing (#13) * Small fixes --- manifest.json | 2 +- pull_request.md | 4 +--- scripts/install | 2 +- scripts/remove | 2 +- scripts/upgrade | 19 +++++++------------ 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/manifest.json b/manifest.json index 9f47ed0..f8891e7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Generic sticky notes for all purpose", "fr": "Des post-its génériques à tout faire" }, - "version": "1.0~ynh2", + "version": "1.0~ynh3", "url": "https://github.com/YunoHost-Apps/chtickynotes_ynh/", "license": "MIT", "developer": { diff --git a/pull_request.md b/pull_request.md index 5abf968..6c28fc5 100644 --- a/pull_request.md +++ b/pull_request.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/chtickynotes_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/chtickynotes_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 d65d16b..d4c3e04 100644 --- a/scripts/install +++ b/scripts/install @@ -95,7 +95,7 @@ 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 [ $is_public -eq 0 ] || ynh_permission_update --permission="main" --add="visitors" diff --git a/scripts/remove b/scripts/remove index 28bb30b..424d97f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -30,7 +30,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." --weight=1 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/upgrade b/scripts/upgrade index 1a6fccb..6d0d794 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,6 +47,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 #================================================= @@ -92,18 +99,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi - #================================================= # RELOAD NGINX #=================================================