From e2b8a21f746b4b0645ffd70b79fd222f77ae4455 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 15:35:21 +0100 Subject: [PATCH 01/12] Fix --- conf/nginx.conf | 5 ----- manifest.json | 2 +- scripts/restore | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 665ba1c..702f78d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,11 +3,6 @@ location / { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - try_files $uri $uri/ /; index index.html index.htm; diff --git a/manifest.json b/manifest.json index 196e6f8..08ad8b0 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/restore b/scripts/restore index 31d8909..507b857 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS From 80597aa8ced930c6b85ce1b4d718e8879afccfc3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 15:36:30 +0100 Subject: [PATCH 02/12] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1c09288..9fdf937 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,7 +92,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --source_id="front" + ynh_setup_source --dest_dir="$final_path" --source_id="front" --keep="/etc/vikunja/config.yml" fi chmod 750 "$final_path" @@ -105,8 +105,8 @@ chmod +x /opt/vikunja/vikunja #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -redis_db=$(ynh_redis_get_free_db) -ynh_add_config --template="../conf/config.yml" --destination="/etc/vikunja/config.yml" +# redis_db=$(ynh_redis_get_free_db) +# ynh_add_config --template="../conf/config.yml" --destination="/etc/vikunja/config.yml" #chmod 600 "/etc/vikunja/config.yml" From f3152a6b6796a94aba3b07a36799004d0bb5e5f4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Dec 2021 22:18:26 +0100 Subject: [PATCH 03/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 08ad8b0..cfd6598 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted To-Do list application", "fr": "Application de liste de tâches auto-hébergée" }, - "version": "0.18.1~ynh2", + "version": "0.18.1~ynh3", "url": "https://vikunja.io/", "upstream": { "license": "GPL-3.0", From 484c205543eae6f2821e8c6b6f186874454dcde3 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 11 Dec 2021 21:18:33 +0000 Subject: [PATCH 04/12] 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 48e19c2..91ff443 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-hosted To-Do list application -**Shipped version:** 0.18.1~ynh2 +**Shipped version:** 0.18.1~ynh3 **Demo:** https://try.vikunja.io/login diff --git a/README_fr.md b/README_fr.md index feb2ecd..099dc09 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Vikunja est une application de liste de tâches Open Source auto-hébergée pour toutes les plateformes. -**Version incluse :** 0.18.1~ynh2 +**Version incluse :** 0.18.1~ynh3 **Démo :** https://try.vikunja.io/login From 01f58eb4318744acf36c641e70701b57437ac466 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 4 Jan 2022 19:10:53 +0100 Subject: [PATCH 05/12] Update _common.sh --- scripts/_common.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2bd68b5..4d4651e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,34 +19,6 @@ pkg_dependencies="postgresql apt-transport-https" # FUTURE OFFICIAL HELPERS #================================================= -# Check the architecture -# -# example: architecture=$(ynh_detect_arch) -# -# usage: ynh_detect_arch -# -# Requires YunoHost version 2.2.4 or higher. - -ynh_detect_arch(){ - local architecture - if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then - architecture="arm64" - elif [ -n "$(uname -m | grep 64)" ]; then - architecture="amd64" - elif [ -n "$(uname -m | grep 86)" ]; then - architecture="386" - elif [ -n "$(uname -m | grep armv7)" ]; then - architecture="arm7" - elif [ -n "$(uname -m | grep armv6)" ]; then - architecture="arm6" - elif [ -n "$(uname -m | grep armv5)" ]; then - architecture="arm5" - else - architecture="unknown" - fi - echo $architecture -} - #================================================= # REDIS HELPERS #================================================= From 608fe96e8d0610670748c553b78fd5bc65bf5e56 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 4 Jan 2022 19:11:01 +0100 Subject: [PATCH 06/12] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6812e5f..0e53741 100644 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC timezone="$(cat /etc/timezone)" -architecture=$(ynh_detect_arch) secret=$(ynh_string_random --length=32) app=$YNH_APP_INSTANCE_NAME From 69b36cd37e2fa2a7d26f12856dc7af16e79c2dbe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 4 Jan 2022 19:13:13 +0100 Subject: [PATCH 07/12] Update upgrade --- scripts/upgrade | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9fdf937..d84baf7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) -architecture=$(ynh_detect_arch) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) @@ -30,7 +29,6 @@ secret=$(ynh_string_random --length=32) #================================================= # CHECK VERSION #================================================= -ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -46,6 +44,11 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi +# Create a permission if needed +if ! ynh_permission_exists --permission="api"; then + ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --auth_header="false" --show_tile="false" --protected="true" +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -103,7 +106,7 @@ chmod +x /opt/vikunja/vikunja #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression --message="Adding a configuration file..." --weight=1 # redis_db=$(ynh_redis_get_free_db) # ynh_add_config --template="../conf/config.yml" --destination="/etc/vikunja/config.yml" From cfb9fe0b7b6d18b5f6f4d1461ac8a534529427cf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 4 Jan 2022 19:15:59 +0100 Subject: [PATCH 08/12] Fix --- conf/front.src | 5 ++--- manifest.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/front.src b/conf/front.src index c9d3457..80f5a3b 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://dl.vikunja.io/frontend/vikunja-frontend-0.18.1.zip -SOURCE_SUM=bb85c0e89aa7fa9d89d2c07629a6f0658fe517065a91912f51487f7a7ae1b4de +SOURCE_URL=https://dl.vikunja.io/frontend/vikunja-frontend-0.18.2.zip +SOURCE_SUM=d2f1069f91ba660fe898d4df7efb40a35dbe743dadaa853a09c79955521ee16f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= SOURCE_EXTRACT=true \ No newline at end of file diff --git a/manifest.json b/manifest.json index cfd6598..59d481b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted To-Do list application", "fr": "Application de liste de tâches auto-hébergée" }, - "version": "0.18.1~ynh3", + "version": "0.18.1~ynh4", "url": "https://vikunja.io/", "upstream": { "license": "GPL-3.0", From a80051cb95d6131accb26b9ac76b04f81cb27078 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 4 Jan 2022 18:16:06 +0000 Subject: [PATCH 09/12] 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 91ff443..a446a8c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self-hosted To-Do list application -**Shipped version:** 0.18.1~ynh3 +**Shipped version:** 0.18.1~ynh4 **Demo:** https://try.vikunja.io/login diff --git a/README_fr.md b/README_fr.md index 099dc09..16a5b14 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Vikunja est une application de liste de tâches Open Source auto-hébergée pour toutes les plateformes. -**Version incluse :** 0.18.1~ynh3 +**Version incluse :** 0.18.1~ynh4 **Démo :** https://try.vikunja.io/login From 85da80b00ece31c458e50f5b21d7e8a06a857efc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jan 2022 13:43:08 +0100 Subject: [PATCH 10/12] Add files --- scripts/install | 4 ++++ scripts/restore | 1 + scripts/upgrade | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0e53741..2b8b49c 100644 --- a/scripts/install +++ b/scripts/install @@ -107,7 +107,11 @@ ynh_script_progression --message="Installing backend..." --weight=15 tempdir="$(mktemp -d)" ynh_setup_source --dest_dir=$tempdir --source_id=api ynh_exec_warn_less dpkg -i $tempdir/vikunja-unstable-amd64.deb + +mkdir -p "/opt/vikunja/files" + chmod +x "/opt/vikunja/vikunja" +chown -R $app:www-data "/opt/vikunja/files" #================================================= # NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 507b857..a5f7ea0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -69,6 +69,7 @@ ynh_restore_file --origin_path="/etc/vikunja/config.yml" ynh_restore_file --origin_path="/opt/vikunja" chmod +x "/opt/vikunja/vikunja" +chown -R $app:www-data "/opt/vikunja/files" #================================================= # REINSTALL DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index d84baf7..580f2c8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -96,12 +96,16 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --source_id="front" --keep="/etc/vikunja/config.yml" + + mkdir -p "/opt/vikunja/files" + fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -chmod +x /opt/vikunja/vikunja +chmod +x "/opt/vikunja/vikunja" +chown -R $app:www-data "/opt/vikunja/files" #================================================= # ADD A CONFIGURATION From e720a088f7696ed1577d44799057def3a908ea4e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jan 2022 13:55:13 +0100 Subject: [PATCH 11/12] Fix --- scripts/install | 2 -- scripts/remove | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 2b8b49c..e3e4662 100644 --- a/scripts/install +++ b/scripts/install @@ -129,8 +129,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 redis_db=$(ynh_redis_get_free_db) ynh_add_config --template="../conf/config.yml" --destination="/etc/vikunja/config.yml" -#chmod 600 "/etc/vikunja/config.yml" - #================================================= # SETUP SYSTEMD #================================================= diff --git a/scripts/remove b/scripts/remove index 00d6e5d..c17afff 100644 --- a/scripts/remove +++ b/scripts/remove @@ -74,7 +74,7 @@ ynh_script_progression --message="Removing $app main directory..." --weight=6 # Remove the app directory securely ynh_secure_remove --file="$final_path" -ynh_secure_remove --file="/etc/vikunja" +#ynh_secure_remove --file="/etc/vikunja" #================================================= # REMOVE NGINX CONFIGURATION From 31260875d38832335f41747d4deab2b3e565a8d4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jan 2022 14:01:36 +0100 Subject: [PATCH 12/12] Add features --- doc/DESCRIPTION.md | 10 ++++++++++ doc/DESCRIPTION_fr.md | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..2467012 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1,10 @@ +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 \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 22f755e..e1f69a4 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1,10 @@ -Vikunja est une application de liste de tâches Open Source auto-hébergée pour toutes les plateformes. \ No newline at end of file +Vikunja est une application de liste de tâches Open Source auto-hébergée pour toutes les plateformes. + +### Features + +- Stay organized +- Collaborate with peers +- Tasks +- Kanban board +- CalDAV +- Links \ No newline at end of file