From 7926be50c736353b3c118dccffd250f60052bd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 24 Feb 2024 23:22:42 +0100 Subject: [PATCH 01/25] Bump to v0.23, that has a single source --- conf/nginx.conf | 13 ++-------- manifest.toml | 23 +++++++--------- scripts/backup | 3 --- scripts/change_url | 4 +-- scripts/install | 42 ++++++++++-------------------- scripts/remove | 5 +--- scripts/restore | 9 ++----- scripts/upgrade | 65 ++++++++++++++++++---------------------------- tests.toml | 2 ++ 9 files changed, 57 insertions(+), 109 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index e693a5d..860493d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,18 +1,9 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Path to source - alias __INSTALL_DIR__/; - - try_files $uri $uri/ /; - - index index.html index.htm; + proxy_pass http://127.0.0.1:__PORT__; + client_max_body_size 20M; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } - -location ~* ^/(api|dav|\.well-known)/ { - proxy_pass http://127.0.0.1:__PORT__; - client_max_body_size 20M; -} diff --git a/manifest.toml b/manifest.toml index 54587c6..510d1df 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "vikunja" @@ -5,7 +7,7 @@ name = "Vikunja" description.en = "Self-hosted To-Do list application" description.fr = "Application de liste de tâches auto-hébergée" -version = "0.22.1~ynh1" +version = "0.23.0~ynh1" maintainers = [] @@ -49,30 +51,23 @@ ram.runtime = "50M" [resources] [resources.sources] - [resources.sources.back] - arm64.url = "https://dl.vikunja.io/api/0.22.1/vikunja-v0.22.1-linux-arm64-full.zip" + [resources.sources.main] + arm64.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-arm64-full.zip" arm64.sha256 = "50a1670c0fde858c1cd7bc72cc670c4011a688a20b07ee62fab11bcca3eab01e" - amd64.url = "https://dl.vikunja.io/api/0.22.1/vikunja-v0.22.1-linux-amd64-full.zip" + amd64.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-amd64-full.zip" amd64.sha256 = "c3e21ca5ccace3f9eaa423bab8c1cfc3e7de15d5c593db0aa6e4dbd9883469e6" - armhf.url = "https://dl.vikunja.io/api/0.22.1/vikunja-v0.22.1-linux-arm-7-full.zip" + armhf.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-arm-7-full.zip" armhf.sha256 = "72f50404df57d75060bdd0d162e12cba20269a0def7b38993e1b61c4cf3d69d2" - i386.url = "https://dl.vikunja.io/api/0.22.1/vikunja-v0.22.1-linux-386-full.zip" + i386.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-386-full.zip" i386.sha256 = "de1e271b6d3fe6024b790b95c1bf946a415598b31192638ef85589cd2c35f996" in_subdir = false format = "zip" - autoupdate.upstream = "https://kolaente.dev/vikunja/vikunja" + autoupdate.strategy = "latest_gitea_release" autoupdate.asset.amd64 = "tarball" autoupdate.asset.i386 = "tarball" autoupdate.asset.arm64 = "tarball" autoupdate.asset.armhf = "tarball" - - [resources.sources.front] - url = "https://dl.vikunja.io/frontend/vikunja-frontend-0.22.1.zip" - sha256 = "8e4145eacb9c2d95a95a43dca2f4dd0fd30ec8934f4562017caf77f3c5f9a277" - in_subdir = false - format = "zip" - [resources.ports] diff --git a/scripts/backup b/scripts/backup index 64e1a14..a9ec4d0 100644 --- a/scripts/backup +++ b/scripts/backup @@ -21,9 +21,6 @@ ynh_print_info --message="Declaring files to be backed up..." # Frontend ynh_backup --src_path="$install_dir" -# Backend -ynh_backup --src_path="$backend_path" - #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= diff --git a/scripts/change_url b/scripts/change_url index a639a04..b3ee07d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -40,9 +40,9 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 domain="$new_domain" path="$new_path" -ynh_add_config --template="../conf/config.yml" --destination="$backend_path/config.yml" +ynh_add_config --template="../conf/config.yml" --destination="$install_dir/config.yml" -chmod 600 "$backend_path/config.yml" +chmod 600 "$install_dir/config.yml" #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index 30293fd..40c0991 100644 --- a/scripts/install +++ b/scripts/install @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers timezone="$(cat /etc/timezone)" secret=$(ynh_string_random --length=32) redis_db=$(ynh_redis_get_free_db) -backend_path=/opt/$app set_motd="" enable_registration="true" @@ -32,7 +31,6 @@ maxitemsperpage=50 # STORE SETTINGS FROM MANIFEST #================================================= -ynh_app_setting_set --app=$app --key=backend_path --value=$backend_path ynh_app_setting_set --app=$app --key=set_motd --value=$set_motd ynh_app_setting_set --app=$app --key=enable_registration --value=$enable_registration ynh_app_setting_set --app=$app --key=enable_linksharing --value=$enable_linksharing @@ -44,31 +42,29 @@ ynh_app_setting_set --app=$app --key=maxavatarsize --value=$maxavatarsize ynh_app_setting_set --app=$app --key=maxitemsperpage --value=$maxitemsperpage #================================================= -# INSTALL FRONTEND +# INSTALL BACKEND #================================================= -ynh_script_progression --message="Setting up frontend..." --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --source_id="front" +ynh_setup_source --dest_dir="$install_dir" +executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" +ln -s "$executable" "$install_dir/vikunja" + +chmod +x "$install_dir/vikunja" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# INSTALL BACKEND +# ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Setting up backend..." --weight=1 +ynh_script_progression --message="Adding a configuration file..." --weight=1 -# Download, check integrity, uncompress and patch the source from app.src -mkdir -p "$backend_path" -mkdir -p "$backend_path/files" -tempdir="$(mktemp -d)" -ynh_setup_source --dest_dir=$tempdir --source_id="back" -back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" -cp "$back" "$backend_path/vikunja" +ynh_add_config --template="config.yml" --destination="$install_dir/config.yml" -chmod +x "$backend_path/vikunja" -chown -R $app:www-data "$backend_path/files" +chmod 400 "$install_dir/config.yml" +chown "$app:$app" "$install_dir/config.yml" #================================================= # SYSTEM CONFIGURATION @@ -81,23 +77,13 @@ ynh_add_systemd_config yunohost service add $app --description="Self-hosted To-Do list application" --log="/var/log/$app/$app.log" -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 - -ynh_add_config --template="config.yml" --destination="$backend_path/config.yml" - -chmod 400 "$backend_path/config.yml" -chown $app:$app "$backend_path/config.yml" - #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=2 +ynh_script_progression --message="Starting $app's systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action=start --log_path=systemd #--line_match="server started on" +ynh_systemd_action --service_name="$app" --action=start --log_path=systemd #--line_match="server started on" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 0e09476..e63c3ec 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SYSTEMD SERVICE +# REMOVE SYSTEMD SERVICE #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 @@ -28,9 +28,6 @@ ynh_remove_systemd_config ynh_redis_remove_db "$redis_db" -# Remove backend -ynh_secure_remove --file="$backend_path" - # Remove the dedicated NGINX config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 8e89323..84e0014 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,14 +16,9 @@ ynh_script_progression --message="Restoring $app main directory..." --weight=4 # Frontend ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -# Backend -ynh_restore_file --origin_path="$backend_path" -chmod +x "$backend_path/vikunja" -chown -R $app:www-data "$backend_path/files" +chmod -R o-rwx "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 0ed8ea6..d67d740 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,71 +17,65 @@ timezone="$(cat /etc/timezone)" secret=$(ynh_string_random --length=32) redis_db=$(ynh_redis_get_free_db) -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# If backend_path doesn't exist, create it -if [ -z "${backend_path:-}" ]; then - backend_path=/opt/$app - ynh_app_setting_set --app=$app --key=backend_path --value=$backend_path -fi - if [ -z "${set_motd:-}" ]; then set_motd="" - ynh_app_setting_set --app=$app --key=set_motd --value=$set_motd + ynh_app_setting_set --app="$app" --key="set_motd" --value="$set_motd" fi if [ -z "${enable_registration:-}" ]; then enable_registration="true" - ynh_app_setting_set --app=$app --key=enable_registration --value=$enable_registration + ynh_app_setting_set --app="$app" --key="enable_registration" --value="$enable_registration" fi if [ -z "${enable_linksharing:-}" ]; then enable_linksharing="true" - ynh_app_setting_set --app=$app --key=enable_linksharing --value=$enable_linksharing + ynh_app_setting_set --app="$app" --key="enable_linksharing" --value="$enable_linksharing" fi if [ -z "${enable_taskattachments:-}" ]; then enable_taskattachments="true" - ynh_app_setting_set --app=$app --key=enable_taskattachments --value=$enable_taskattachments + ynh_app_setting_set --app="$app" --key="enable_taskattachments" --value="$enable_taskattachments" fi if [ -z "${enable_taskcomments:-}" ]; then enable_taskcomments="true" - ynh_app_setting_set --app=$app --key=enable_taskcomments --value=$enable_taskcomments + ynh_app_setting_set --app="$app" --key="enable_taskcomments" --value="$enable_taskcomments" fi if [ -z "${enable_emailreminders:-}" ]; then enable_emailreminders="true" - ynh_app_setting_set --app=$app --key=enable_emailreminders --value=$enable_emailreminders + ynh_app_setting_set --app="$app" --key="enable_emailreminders" --value="$enable_emailreminders" fi if [ -z "${enable_userdeletion:-}" ]; then enable_userdeletion="true" - ynh_app_setting_set --app=$app --key=enable_userdeletion --value=$enable_userdeletion + ynh_app_setting_set --app="$app" --key="enable_userdeletion" --value="$enable_userdeletion" fi if [ -z "${maxavatarsize:-}" ]; then maxavatarsize=1024 - ynh_app_setting_set --app=$app --key=maxavatarsize --value=$maxavatarsize + ynh_app_setting_set --app="$app" --key="maxavatarsize" --value="$maxavatarsize" fi if [ -z "${maxitemsperpage:-}" ]; then maxitemsperpage=50 - ynh_app_setting_set --app=$app --key=maxitemsperpage --value=$maxitemsperpage + ynh_app_setting_set --app="$app" --key="maxitemsperpage" --value="$maxitemsperpage" fi if [ -z "${language:-}" ]; then language="en" - ynh_app_setting_set --app=$app --key=language --value=$language + ynh_app_setting_set --app="$app" --key="language" --value="$language" +fi + +if ynh_compare_current_package_version --comparison lt --version "0.23.0~ynh1"; then + mv "$backend_path/config.yml" "$install_dir/config.yml" + ynh_secure_remove "$backend_path" + ynh_app_setting_delete --app="$app" --key="backend_path" fi #================================================= @@ -96,36 +90,27 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 +# Frontend +ynh_setup_source --dest_dir="$install_dir" +executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" +ln -s "$executable" "$install_dir/vikunja" - # Frontend - ynh_setup_source --dest_dir="$install_dir" --source_id="front" - - # Backend - mkdir -p "$backend_path/files" - tempdir="$(mktemp -d)" - ynh_setup_source --dest_dir=$tempdir --source_id="back" - back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" - cp "$back" "$backend_path/vikunja" -fi +chmod +x "$install_dir/vikunja" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -chmod +x "$backend_path/vikunja" -chown -R $app:www-data "$backend_path/files" #================================================= # UPGRADE A CONFIGURATION #================================================= ynh_script_progression --message="Upgrading a configuration file..." --weight=1 -ynh_add_config --template="config.yml" --destination="$backend_path/config.yml" +ynh_add_config --template="config.yml" --destination="$install_dir/config.yml" -chmod 400 "$backend_path/config.yml" -chown $app:$app "$backend_path/config.yml" +chmod 400 "$install_dir/config.yml" +chown $app:$app "$install_dir/config.yml" #================================================= # NGINX CONFIGURATION diff --git a/tests.toml b/tests.toml index 98df2e1..11b0f90 100644 --- a/tests.toml +++ b/tests.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + test_format = 1.0 [default] From a371ac55553da95a0159f482abcc85255d8c635f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 24 Feb 2024 22:22:47 +0000 Subject: [PATCH 02/25] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ddf9ee0..a8e1ea6 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Vikunja is a self-hosted open-source to-do list application for all platforms. - CalDAV - Links -**Shipped version:** 0.22.1~ynh1 +**Shipped version:** 0.23.0~ynh1 **Demo:** https://try.vikunja.io/login diff --git a/README_fr.md b/README_fr.md index 80961cc..698813c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ Vikunja est une application de liste de tâches Open Source auto-hébergée pour - CalDAV - Links -**Version incluse :** 0.22.1~ynh1 +**Version incluse :** 0.23.0~ynh1 **Démo :** https://try.vikunja.io/login From d520ec8a0101839e80c178acd57bc23b64fe369a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 May 2024 08:45:14 +0200 Subject: [PATCH 03/25] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 510d1df..43ab113 100644 --- a/manifest.toml +++ b/manifest.toml @@ -53,13 +53,13 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] arm64.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-arm64-full.zip" - arm64.sha256 = "50a1670c0fde858c1cd7bc72cc670c4011a688a20b07ee62fab11bcca3eab01e" + arm64.sha256 = "9d0cdfa56851f4a1093d6ba890499e8cd0ee3173b4112b3598e1fbff77b3f6f7" amd64.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-amd64-full.zip" - amd64.sha256 = "c3e21ca5ccace3f9eaa423bab8c1cfc3e7de15d5c593db0aa6e4dbd9883469e6" + amd64.sha256 = "bab361cbc2988885679b3ebc46fd3e05e83feca690cb770fa81ac13d62b03f42" armhf.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-arm-7-full.zip" - armhf.sha256 = "72f50404df57d75060bdd0d162e12cba20269a0def7b38993e1b61c4cf3d69d2" + armhf.sha256 = "513ca8c7b4fc3f5d06868ebb2059067b3ed1befd96fba38284abb953ca20d13a" i386.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-386-full.zip" - i386.sha256 = "de1e271b6d3fe6024b790b95c1bf946a415598b31192638ef85589cd2c35f996" + i386.sha256 = "bc8b0ffb543d7f3a0bd117e171faa9520c2fb2cbbd51d7230dd0cd109cdca4c2" in_subdir = false format = "zip" From 8064476d2747515ae2be49a26be14bc96ef54577 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 3 May 2024 06:45:19 +0000 Subject: [PATCH 04/25] Auto-update READMEs --- ALL_README.md | 7 ++++++ README.md | 28 +++++++++++------------ README_eu.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++++------------- README_gl.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 211 insertions(+), 30 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,7 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index a8e1ea6..2a553f5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Vikunja with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vikunja) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Vikunja 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.* +> *This package allows you to install Vikunja 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.* ## Overview @@ -29,7 +29,7 @@ Vikunja is a self-hosted open-source to-do list application for all platforms. **Shipped version:** 0.23.0~ynh1 -**Demo:** https://try.vikunja.io/login +**Demo:** ## Screenshots @@ -37,22 +37,22 @@ Vikunja is a self-hosted open-source to-do list application for all platforms. ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug or sudo yunohost app upgrade vikunja -u https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..a633a5f --- /dev/null +++ b/README_eu.md @@ -0,0 +1,58 @@ + + +# Vikunja YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/vikunja.svg)](https://dash.yunohost.org/appci/app/vikunja) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/vikunja.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/vikunja.maintain.svg) + +[![Instalatu Vikunja YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vikunja) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Vikunja YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Vikunja is a self-hosted open-source to-do list application for all platforms. + +### Features + +- Stay organized +- Collaborate with peers +- Tasks +- Kanban board +- CalDAV +- Links + +**Paketatutako bertsioa:** 0.23.0~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Vikunja(r)en pantaila-argazkia](./doc/screenshots/kanban.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug +edo +sudo yunohost app upgrade vikunja -u https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 698813c..5d09695 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Vikunja pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Vikunja avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vikunja) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Vikunja rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Vikunja rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -27,9 +27,9 @@ Vikunja est une application de liste de tâches Open Source auto-hébergée pour - CalDAV - Links -**Version incluse :** 0.23.0~ynh1 +**Version incluse :** 0.23.0~ynh1 -**Démo :** https://try.vikunja.io/login +**Démo :** ## Captures d’écran @@ -37,22 +37,22 @@ Vikunja est une application de liste de tâches Open Source auto-hébergée pour ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug ou sudo yunohost app upgrade vikunja -u https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..7ca4a7a --- /dev/null +++ b/README_gl.md @@ -0,0 +1,58 @@ + + +# Vikunja para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/vikunja.svg)](https://dash.yunohost.org/appci/app/vikunja) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/vikunja.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/vikunja.maintain.svg) + +[![Instalar Vikunja con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vikunja) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Vikunja de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Vikunja is a self-hosted open-source to-do list application for all platforms. + +### Features + +- Stay organized +- Collaborate with peers +- Tasks +- Kanban board +- CalDAV +- Links + +**Versión proporcionada:** 0.23.0~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Vikunja](./doc/screenshots/kanban.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug +ou +sudo yunohost app upgrade vikunja -u https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..04ca164 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,58 @@ + + +# YunoHost 的 Vikunja + +[![集成程度](https://dash.yunohost.org/integration/vikunja.svg)](https://dash.yunohost.org/appci/app/vikunja) ![工作状态](https://ci-apps.yunohost.org/ci/badges/vikunja.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/vikunja.maintain.svg) + +[![使用 YunoHost 安装 Vikunja](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vikunja) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Vikunja。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Vikunja is a self-hosted open-source to-do list application for all platforms. + +### Features + +- Stay organized +- Collaborate with peers +- Tasks +- Kanban board +- CalDAV +- Links + +**分发版本：** 0.23.0~ynh1 + +**演示：** + +## 截图 + +![Vikunja 的截图](./doc/screenshots/kanban.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug +或 +sudo yunohost app upgrade vikunja -u https://github.com/YunoHost-Apps/vikunja_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 8abc756f3385a07948a1e9e55d961f8c2bec8ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 May 2024 08:58:26 +0200 Subject: [PATCH 05/25] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 40c0991..3aed821 100644 --- a/scripts/install +++ b/scripts/install @@ -48,6 +48,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" +tempdir="$(mktemp -d)" executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" ln -s "$executable" "$install_dir/vikunja" From f92d6cf9c2244710258e36f2b38e3da26e14b414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 May 2024 09:03:12 +0200 Subject: [PATCH 06/25] Update install --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3aed821..a9a31dd 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" tempdir="$(mktemp -d)" executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" -ln -s "$executable" "$install_dir/vikunja" +#ln -s "$executable" "$install_dir/vikunja" +mv "$executable" "$install_dir/vikunja" chmod +x "$install_dir/vikunja" From 3e10e2e8ac39f2ff6ef8fb53cc51cc12c2043f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 May 2024 09:03:50 +0200 Subject: [PATCH 07/25] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a9a31dd..bbfdd4f 100644 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_setup_source --dest_dir="$install_dir" tempdir="$(mktemp -d)" executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" #ln -s "$executable" "$install_dir/vikunja" -mv "$executable" "$install_dir/vikunja" +mv "$executable" "$install_dir" chmod +x "$install_dir/vikunja" From fe203f99bbca75c5871ab4cd069761f7c08a56a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 May 2024 09:18:50 +0200 Subject: [PATCH 08/25] Update install --- scripts/install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index bbfdd4f..3aed821 100644 --- a/scripts/install +++ b/scripts/install @@ -50,8 +50,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" tempdir="$(mktemp -d)" executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" -#ln -s "$executable" "$install_dir/vikunja" -mv "$executable" "$install_dir" +ln -s "$executable" "$install_dir/vikunja" chmod +x "$install_dir/vikunja" From 5b28f78827b8f682d0340642f3ba91ceff3a324e Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Sun, 28 Jul 2024 15:58:01 -0500 Subject: [PATCH 09/25] Bump version to v0.24.1 --- manifest.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 43ab113..09fba57 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Vikunja" description.en = "Self-hosted To-Do list application" description.fr = "Application de liste de tâches auto-hébergée" -version = "0.23.0~ynh1" +version = "0.24.1~ynh1" maintainers = [] @@ -52,14 +52,14 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - arm64.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-arm64-full.zip" - arm64.sha256 = "9d0cdfa56851f4a1093d6ba890499e8cd0ee3173b4112b3598e1fbff77b3f6f7" - amd64.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-amd64-full.zip" - amd64.sha256 = "bab361cbc2988885679b3ebc46fd3e05e83feca690cb770fa81ac13d62b03f42" - armhf.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-arm-7-full.zip" - armhf.sha256 = "513ca8c7b4fc3f5d06868ebb2059067b3ed1befd96fba38284abb953ca20d13a" - i386.url = "https://dl.vikunja.io/vikunja/0.23.0/vikunja-v0.23.0-linux-386-full.zip" - i386.sha256 = "bc8b0ffb543d7f3a0bd117e171faa9520c2fb2cbbd51d7230dd0cd109cdca4c2" + arm64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-arm64-full.zip" + arm64.sha256 = "6642be9e0822ac8086c76823a2c090257f9cd5cacc2fd349ed12af520478ce55" + amd64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-amd64-full" + amd64.sha256 = "62a5e936c7dc193fc0a2db46767ea015f2e45a06fd0e40b5b0918b05bfb2d1ff" + armhf.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-arm-7-full.zip" + armhf.sha256 = "f7ff14b789376fd4cd41e331e6bd399538a64626891bd77f14258b3fec901346" + i386.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-386-full.zip" + i386.sha256 = "a552c4e031cbe4f69b13636d326f4bfa525905211469e615e51bd6d8cc85f923" in_subdir = false format = "zip" From cd5406573d046812e9c29764e6e3344b94055d58 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Sun, 28 Jul 2024 15:58:16 -0500 Subject: [PATCH 10/25] Fix linking executable --- scripts/install | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 3aed821..4427c90 100644 --- a/scripts/install +++ b/scripts/install @@ -42,15 +42,14 @@ ynh_app_setting_set --app=$app --key=maxavatarsize --value=$maxavatarsize ynh_app_setting_set --app=$app --key=maxitemsperpage --value=$maxitemsperpage #================================================= -# INSTALL BACKEND +# INSTALL Vikunja #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -tempdir="$(mktemp -d)" -executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" -ln -s "$executable" "$install_dir/vikunja" +executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" +ln -s "$executable" "/usr/bin/vikunja" chmod +x "$install_dir/vikunja" From 256ee970d2628fc9fac0fd943ea465d5c8b06de0 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Sun, 28 Jul 2024 15:58:26 -0500 Subject: [PATCH 11/25] Fix systemd exec --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 8d1a42d..ef56d2f 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=/opt/__APP__/ -ExecStart=/opt/__APP__/vikunja +ExecStart=/usr/bin/vikunja RestartSec=2s Restart=always From 4dc17f652536d423768c8e07be2fcd0b6cbd4470 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Sun, 28 Jul 2024 16:10:16 -0500 Subject: [PATCH 12/25] Update manifest.toml Fix AMD asset shasum --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ad03dff..929af29 100644 --- a/manifest.toml +++ b/manifest.toml @@ -52,7 +52,7 @@ ram.runtime = "50M" arm64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-arm64-full.zip" arm64.sha256 = "6642be9e0822ac8086c76823a2c090257f9cd5cacc2fd349ed12af520478ce55" amd64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-amd64-full" - amd64.sha256 = "62a5e936c7dc193fc0a2db46767ea015f2e45a06fd0e40b5b0918b05bfb2d1ff" + amd64.sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" armhf.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-arm-7-full.zip" armhf.sha256 = "f7ff14b789376fd4cd41e331e6bd399538a64626891bd77f14258b3fec901346" i386.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-386-full.zip" From 418e8ffc7abdbe03a16816c42378e61654a403b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:22:07 +0200 Subject: [PATCH 13/25] Update upgrade --- scripts/upgrade | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0ed8ea6..45ad19b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,12 +17,6 @@ timezone="$(cat /etc/timezone)" secret=$(ynh_string_random --length=32) redis_db=$(ynh_redis_get_free_db) -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -96,21 +90,17 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=5 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=5 - - # Frontend - ynh_setup_source --dest_dir="$install_dir" --source_id="front" +# Frontend +ynh_setup_source --dest_dir="$install_dir" --source_id="front" - # Backend - mkdir -p "$backend_path/files" - tempdir="$(mktemp -d)" - ynh_setup_source --dest_dir=$tempdir --source_id="back" - back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" - cp "$back" "$backend_path/vikunja" -fi +# Backend +mkdir -p "$backend_path/files" +tempdir="$(mktemp -d)" +ynh_setup_source --dest_dir=$tempdir --source_id="back" +back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" +cp "$back" "$backend_path/vikunja" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 64a3337545ca5edccd51ac228ed3908519b003d1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Jul 2024 10:22:13 +0000 Subject: [PATCH 14/25] Auto-update READMEs --- README_id.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_id.md b/README_id.md index 05306b9..eeb6ae8 100644 --- a/README_id.md +++ b/README_id.md @@ -39,7 +39,7 @@ Vikunja is a self-hosted open-source to-do list application for all platforms. - Website aplikasi resmi: - Dokumentasi admin resmi: -- Repositori kode aplikasi hulu: +- Depot kode aplikasi hulu: - Gudang YunoHost: - Laporkan bug: From 1136cb72fc2d35486488b458b57331345b8a21ac Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 13:43:19 -0500 Subject: [PATCH 15/25] Update manifest.toml Fix amd64 asset --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 929af29..4897279 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,8 +51,8 @@ ram.runtime = "50M" [resources.sources.main] arm64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-arm64-full.zip" arm64.sha256 = "6642be9e0822ac8086c76823a2c090257f9cd5cacc2fd349ed12af520478ce55" - amd64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-amd64-full" - amd64.sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + amd64.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-amd64-full.zip" + amd64.sha256 = "62a5e936c7dc193fc0a2db46767ea015f2e45a06fd0e40b5b0918b05bfb2d1ff" armhf.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-arm-7-full.zip" armhf.sha256 = "f7ff14b789376fd4cd41e331e6bd399538a64626891bd77f14258b3fec901346" i386.url = "https://dl.vikunja.io/vikunja/0.24.1/vikunja-v0.24.1-linux-386-full.zip" From 6343d286d1c544f8cb79b94a123f30b3637f03af Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 13:59:35 -0500 Subject: [PATCH 16/25] Update systemd.service Fix systemd working directory --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index ef56d2f..789716a 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Requires=postgresql.service redis.service Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=/opt/__APP__/ +WorkingDirectory=/var/www/__APP__/ ExecStart=/usr/bin/vikunja RestartSec=2s Restart=always From 92cc221c1234b03a7c4d9e5f5cd3fd96f25413f8 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:00:59 -0500 Subject: [PATCH 17/25] Update install Fix chmod for executable --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4427c90..82e7ae2 100644 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_setup_source --dest_dir="$install_dir" executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" ln -s "$executable" "/usr/bin/vikunja" -chmod +x "$install_dir/vikunja" +chmod +x "$executable" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 0479896eef38fd20cf675ec6aa67e419aabbea60 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:07:53 -0500 Subject: [PATCH 18/25] Update config_panel.toml Fix config panel --- config_panel.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 64d977b..ac24e5d 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -13,7 +13,7 @@ services = ["__APP__"] ask.fr = "Définir le MOTD" type = "string" help = "Set the MOTD message shown in Vikunja login page" - bind = "motd:/opt/__APP__/config.yml" + bind = "motd:/var/www/__APP__/config.yml" [main.config.enable_registration] ask.en = "Enable registration" @@ -22,7 +22,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Whether to let new users registering themselves or not" - bind = "enableregistration:/opt/__APP__/config.yml" + bind = "enableregistration:/var/www/__APP__/config.yml" [main.config.enable_linksharing] ask.en = "Enable links sharing" @@ -31,7 +31,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Enable sharing of lists via a link" - bind = "enablelinksharing:/opt/__APP__/config.yml" + bind = "enablelinksharing:/var/www/__APP__/config.yml" [main.config.enable_taskattachments] ask.en = "Enable tasks attachments" @@ -40,7 +40,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Whether to enable task attachments or not" - bind = "enabletaskattachments:/opt/__APP__/config.yml" + bind = "enabletaskattachments:/var/www/__APP__/config.yml" [main.config.enable_taskcomments] ask.en = "Enable task comments" @@ -49,7 +49,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Whether task comments should be enabled or not" - bind = "enabletaskcomments:/opt/__APP__/config.yml" + bind = "enabletaskcomments:/var/www/__APP__/config.yml" [main.config.enable_emailreminders] ask.en = "Enable email reminders" @@ -58,7 +58,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "If enabled, vikunja will send an email to everyone who is either assigned to a task or created it when a task reminder is due." - bind = "enableemailreminders:/opt/__APP__/config.yml" + bind = "enableemailreminders:/var/www/__APP__/config.yml" [main.config.enable_userdeletion] ask.en = "Enable user deletion" @@ -67,19 +67,19 @@ services = ["__APP__"] yes = "true" no = "false" help = "If true, will allow users to request the complete deletion of their account. When using external authentication methods it may be required to coordinate with them in order to delete the account. This setting will not affect the cli commands for user deletion" - bind = "enableuserdeletion:/opt/__APP__/config.yml" + bind = "enableuserdeletion:/var/www/__APP__/config.yml" [main.config.maxavatarsize] ask.en = "Max avatar size" ask.fr = "Taille maximum de l'avatar" type = "number" help = "The maximum size clients will be able to request for user avatars. If clients request a size bigger than this, it will be changed on the fly" - bind = "maxavatarsize:/opt/__APP__/config.yml" + bind = "maxavatarsize:/var/www/__APP__/config.yml" [main.config.maxitemsperpage] ask.en = "Max items per page" ask.fr = "Nombre d'éléments maximum par page" type = "number" help = "The max number of items which can be returned per page" - bind = "maxitemsperpage:/opt/__APP__/config.yml" + bind = "maxitemsperpage:/var/www/__APP__/config.yml" From a3a93ad810f469873e5923ea0963babfee68690b Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:20:13 -0500 Subject: [PATCH 19/25] Update install Rename executable instead of setting a link --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 82e7ae2..55bf89b 100644 --- a/scripts/install +++ b/scripts/install @@ -49,9 +49,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" -ln -s "$executable" "/usr/bin/vikunja" +mv "$executable" "vikunja" -chmod +x "$executable" +chmod +x "$install_dir/vikunja" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 2d95cddf0f6acfabde3998ffdbc0171d9a2a2224 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:20:51 -0500 Subject: [PATCH 20/25] Update systemd.service Fix systemd executable --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 789716a..4abdff6 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=/var/www/__APP__/ -ExecStart=/usr/bin/vikunja +ExecStart=/var/www/__APP__/vikunja RestartSec=2s Restart=always From f6315632b41e48c4df2f29096e582e5d71ba9523 Mon Sep 17 00:00:00 2001 From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:30:10 -0500 Subject: [PATCH 21/25] Update install Fix directory for executable --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 55bf89b..a467126 100644 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" -mv "$executable" "vikunja" +mv "$executable" "$install_dir/vikunja" chmod +x "$install_dir/vikunja" From 6e2b072db6c2e618ca91f0456184ec0c96ba45f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:36:41 +0200 Subject: [PATCH 22/25] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 757a4a6..e9ee5ec 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,7 +93,7 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd ynh_script_progression --message="Upgrading source files..." --weight=5 ynh_setup_source --dest_dir="$install_dir" -executable="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")" +executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" ln -s "$executable" "$install_dir/vikunja" chmod +x "$install_dir/vikunja" From 3f5780c8068d471a77f58e6ddae981a3b79a29a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:43:11 +0200 Subject: [PATCH 23/25] cleaning --- conf/config.yml | 2 +- conf/systemd.service | 4 ++-- manifest.toml | 4 ++-- scripts/backup | 7 +------ scripts/change_url | 2 +- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 8 ++++---- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/conf/config.yml b/conf/config.yml index f7f11a8..e7f1585 100644 --- a/conf/config.yml +++ b/conf/config.yml @@ -21,7 +21,7 @@ service: # The base path on the file system where the binary and assets are. # Vikunja will also look in this path for a config file, so you could provide only this variable to point to a folder # with a config file which will then be used. - rootpath: "/opt/vikunja/" + rootpath: "__INSTALL_DIR__" # Path on the file system to serve static files from. Set to the path of the frontend files to host frontend alongside the api. staticpath: "" # The max number of items which can be returned per page diff --git a/conf/systemd.service b/conf/systemd.service index 4abdff6..8bb8aa2 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,8 +7,8 @@ Requires=postgresql.service redis.service Type=simple User=__APP__ Group=__APP__ -WorkingDirectory=/var/www/__APP__/ -ExecStart=/var/www/__APP__/vikunja +WorkingDirectory=__INSTALL_DIR__/ +ExecStart=__INSTALL_DIR__/vikunja RestartSec=2s Restart=always diff --git a/manifest.toml b/manifest.toml index 4897279..89e51ca 100644 --- a/manifest.toml +++ b/manifest.toml @@ -66,8 +66,6 @@ ram.runtime = "50M" autoupdate.asset.arm64 = "tarball" autoupdate.asset.armhf = "tarball" - [resources.ports] - [resources.system_user] allow_email = true @@ -80,6 +78,8 @@ ram.runtime = "50M" api.allowed = "visitors" api.auth_header = false + [resources.ports] + [resources.apt] packages = "postgresql" diff --git a/scripts/backup b/scripts/backup index a9ec4d0..c711f03 100644 --- a/scripts/backup +++ b/scripts/backup @@ -18,19 +18,14 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -# Frontend ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= diff --git a/scripts/change_url b/scripts/change_url index b3ee07d..e8cbf6f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -40,7 +40,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 domain="$new_domain" path="$new_path" -ynh_add_config --template="../conf/config.yml" --destination="$install_dir/config.yml" +ynh_add_config --template="config.yml" --destination="$install_dir/config.yml" chmod 600 "$install_dir/config.yml" diff --git a/scripts/install b/scripts/install index a467126..a3fae88 100644 --- a/scripts/install +++ b/scripts/install @@ -52,7 +52,6 @@ executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" mv "$executable" "$install_dir/vikunja" chmod +x "$install_dir/vikunja" - chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" diff --git a/scripts/restore b/scripts/restore index 84e0014..72d6098 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Restoring $app main directory..." --weight=4 -# Frontend ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index e9ee5ec..9251252 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,9 +102,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# UPGRADE A CONFIGURATION +# UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Upgrading a configuration file..." --weight=1 +ynh_script_progression --message="Updating $app's configuration files..." --weight=1 ynh_add_config --template="config.yml" --destination="$install_dir/config.yml" @@ -112,9 +112,9 @@ chmod 400 "$install_dir/config.yml" chown $app:$app "$install_dir/config.yml" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 ynh_add_nginx_config From 262fb9198f21ab0ed7cc1d8f395f3f461c7eb967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:52:18 +0200 Subject: [PATCH 24/25] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9251252..61c7ba1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -94,7 +94,7 @@ ynh_script_progression --message="Upgrading source files..." --weight=5 ynh_setup_source --dest_dir="$install_dir" executable="$(find $install_dir -name "vikunja-*" \! -name "*.sha256")" -ln -s "$executable" "$install_dir/vikunja" +mv "$executable" "$install_dir/vikunja" chmod +x "$install_dir/vikunja" From a1021260d3519792033abc3e6a7ece2961028128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:08:25 +0200 Subject: [PATCH 25/25] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 11b0f90..58b03fd 100644 --- a/tests.toml +++ b/tests.toml @@ -14,4 +14,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.4cf807ee10e609d85147ac389ea7f62260c733b2.name = "Upgrade from 0.20.2" + #test_upgrade_from.4cf807ee10e609d85147ac389ea7f62260c733b2.name = "Upgrade from 0.20.2"