From f7dfa592183f3cb2399763710f50dde428ea6365 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Nov 2020 17:13:12 +0100 Subject: [PATCH 1/3] Update upgrade --- scripts/upgrade | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 0e66432..6b24ee3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -205,6 +205,13 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions on app files chown -R "$app":"$app" "$final_path" +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..." + +yunohost service add $app --description "$app daemon for Wiki.js" --log_type systemd + #================================================= # SETUP SSOWAT #================================================= From 35edca0d002ce4385fe1967c079979b612d8f3be Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 18:19:54 +0100 Subject: [PATCH 2/3] Fix linter warnings --- manifest.json | 2 +- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index ed38034..692ac56 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 4697f68..2029f8e 100644 --- a/scripts/install +++ b/scripts/install @@ -166,7 +166,7 @@ chown -R "$app":"$app" "$final_path" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Wiki.js" --log_type systemd +yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 8d72989..f23531c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -106,14 +106,14 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Wiki.js" --log_type systemd +yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 6b24ee3..0c012c6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -210,7 +210,7 @@ chown -R "$app":"$app" "$final_path" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Wiki.js" --log_type systemd +yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/log/$app/$app.log" #================================================= # SETUP SSOWAT From 3a655b0827b3295bfd14bcf5fdbfe62e3897c763 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 19 Dec 2020 10:34:22 +0100 Subject: [PATCH 3/3] Small fixes --- README.md | 2 +- check_process | 5 ----- issue_template.md | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 427820d..1163b4c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Wiki.js for YunoHost [![Integration level](https://dash.yunohost.org/integration/wikijs.svg)](https://dash.yunohost.org/appci/app/wikijs) ![](https://ci-apps.yunohost.org/ci/badges/wikijs.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/wikijs.maintain.svg) -[![Install Wiki.js with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wikijs) +[![Install Wiki.js with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=wikijs) > *This package allows you to install Wiki.js quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* diff --git a/check_process b/check_process index 273c07f..aee678f 100644 --- a/check_process +++ b/check_process @@ -28,13 +28,8 @@ upgrade=1 from_commit=ed3d16ea928155936ecf8753fcc6096a01971e6d backup_restore=1 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 port_already_use=0 change_url=0 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email=yalh@yahoo.com Notification=yes diff --git a/issue_template.md b/issue_template.md index a26e62b..00bdbb5 100644 --- a/issue_template.md +++ b/issue_template.md @@ -20,7 +20,7 @@ about: Create a report to help us debug, it would be nice to fill the template a - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*