From 1af04dddc3ce15ba25a6d9302b78a782aca2fbc6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 16:42:16 +0100 Subject: [PATCH] Fix --- README.md | 8 ++------ README_fr.md | 10 +++------- check_process.default | 2 +- manifest.json | 12 ++---------- scripts/backup | 8 -------- scripts/change_url | 14 +++++++------- scripts/install | 4 +++- scripts/restore | 4 +++- scripts/upgrade | 4 +++- 9 files changed, 24 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index a6e50c6..8938a23 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Focalboard for YunoHost [![Integration level](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg) -[![Install focalboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard) +[![Install Focalboard with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard) *[Lire ce readme en français.](./README_fr.md)* @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Quick description of this app. +Focalboard is an open source, self-hosted alternative to Trello, Notion, and Asana. It helps define, organize, track and manage work across individuals and teams. **Shipped version:** 0.6.1 @@ -17,10 +17,6 @@ Quick description of this app. ![](https://www.focalboard.com/img/hero.jpg) -## Demo - -* [Official demo](Link to a demo site for this app.) - ## Configuration How to configure this app: From an admin panel, a plain file with SSH, or any other way. diff --git a/README_fr.md b/README_fr.md index 02ebb42..368eab5 100755 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ -# App exemple pour YunoHost +# Focalboard pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/focalboard.svg)](https://dash.yunohost.org/appci/app/focalboard) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/focalboard.maintain.svg) -[![Installer focalboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard) +[![Installer Focalboard avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=focalboard) *[Read this readme in english.](./README.md)* @@ -9,7 +9,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble -Description rapide de cette application. +Focalboard est une alternative open source auto-hébergée à Trello, Notion et Asana. Il aide à définir, organiser, suivre et gérer le travail entre les individus et les équipes. **Version incluse :** 0.6.1 @@ -17,10 +17,6 @@ Description rapide de cette application. ![](https://www.focalboard.com/img/hero.jpg) -## Démo - -* [Démo officielle](Lien vers un site de démonstration de cette application.) - ## Configuration Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH ou tout autre moyen. diff --git a/check_process.default b/check_process.default index 5289007..62e1f83 100755 --- a/check_process.default +++ b/check_process.default @@ -6,7 +6,7 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path="/path" (PATH) + path="/" (PATH) is_public=1 (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 diff --git a/manifest.json b/manifest.json index 6c679b3..2e07aad 100755 --- a/manifest.json +++ b/manifest.json @@ -4,15 +4,13 @@ "packaging_format": 1, "description": { "en": "Self-hosted alternative to Trello, Notion, and Asana", - "fr": "Alternative auto-hébergée à Trello, Notion et Asana " + "fr": "Alternative auto-hébergée à Trello, Notion et Asana" }, "version": "0.6.1~ynh1", "url": "https://www.focalboard.com/", "license": "MIT", "maintainer": { - "name": "John doe", - "email": "john.doe@example.com", - "url": "http://example.com" + "name": "John doe" }, "requirements": { "yunohost": ">= 4.1.7" @@ -29,12 +27,6 @@ "type": "domain", "example": "example.com" }, - { - "name": "path", - "type": "path", - "example": "/focalboard", - "default": "/focalboard" - }, { "name": "is_public", "type": "boolean", diff --git a/scripts/backup b/scripts/backup index a2c5b22..199209a 100755 --- a/scripts/backup +++ b/scripts/backup @@ -49,14 +49,6 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup --src_path="/etc/logrotate.d/$app" - #================================================= # BACKUP SYSTEMD #================================================= diff --git a/scripts/change_url b/scripts/change_url index 4401818..dca5b5b 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -67,14 +67,14 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping a systemd service..." --weight=3 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -105,14 +105,14 @@ fi #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." --weight=4 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -120,4 +120,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --time --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index 82b9cde..a64e968 100755 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,9 @@ ynh_add_config --template="../conf/config.json" --destination="$final_path/confi #================================================= # Set permissions to app files -chown -R $app: $final_path +chown -R $app:$app $final_path +chmod -R o-rwx "$final_path" +chmod 600 $final_path/config.json #================================================= # INTEGRATE SERVICE IN YUNOHOST diff --git a/scripts/restore b/scripts/restore index ef1459c..2d85e43 100755 --- a/scripts/restore +++ b/scripts/restore @@ -73,7 +73,9 @@ ynh_system_user_create --username=$app #================================================= # Restore permissions on app files -chown -R $app: $final_path +chown -R $app:$app $final_path +chmod -R o-rwx "$final_path" +chmod 600 $final_path/config.json #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 00a530b..2988f4e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,7 +118,9 @@ ynh_add_config --template="some_config_file" --destination="$final_path/some_con #================================================= # Set permissions on app files -chown -R $app: $final_path +chown -R $app:$app $final_path +chmod -R o-rwx "$final_path" +chmod 600 $final_path/config.json #================================================= # SETUP LOGROTATE