From c18d7428955220173470cbb935e02edcc3e87afb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 23 Jan 2021 09:45:50 +0100 Subject: [PATCH] Fix linter warnings --- issue_template.md | 2 +- manifest.json | 2 +- pull_request_template.md | 4 +--- scripts/install | 7 ++++--- scripts/restore | 2 +- scripts/upgrade | 16 ++-------------- 6 files changed, 10 insertions(+), 23 deletions(-) diff --git a/issue_template.md b/issue_template.md index c5d9a86..7b44bc9 100644 --- a/issue_template.md +++ b/issue_template.md @@ -8,7 +8,7 @@ about: Create a report to help us debug, it would be nice to fill the template a 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* - - *Otherwise, the issue may be due to distbin itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to Distbin itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- diff --git a/manifest.json b/manifest.json index 2b1cc4c..b99914e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Distributed pastebin with ActivityPub.", "fr": "Pastebin distribué utilisant le protocole ActivityPub." }, - "version": "1.3.0~ynh5", + "version": "1.3.0~ynh6", "url": "https://distbin.com/", "license": "Apache-2.0", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 166771a..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/distbin_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/distbin_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 c5d7979..c71c23d 100644 --- a/scripts/install +++ b/scripts/install @@ -169,7 +169,7 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description="$app daemon for distbin" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Distributed pastebin" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -190,8 +190,9 @@ ynh_script_progression --message="Configuring SSOwat..." # 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="/" + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index fdd5d88..bd3bd9e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -105,7 +105,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description="$app daemon for distbin" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Distributed pastebin" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 94c61d5..310e92c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -119,7 +119,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path ynh_script_progression --message="Creating log folder..." mkdir -p "/var/log/$app" -chown -R "$app":"$app" "/var/log/$app" +chown -R $app:$app "/var/log/$app" #================================================= # CREATE STORAGE FOLDER @@ -188,7 +188,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description="$app daemon for distbin" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Distributed pastebin" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -200,18 +200,6 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 fi -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# 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 #=================================================