Merge pull request #47 from YunoHost-Apps/testing

Testing

README.md

@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Vikunja for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/vikunja.svg)](https://dash.yunohost.org/appci/app/vikunja) ![Working status](https://ci-apps.yunohost.org/ci/badges/vikunja.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/vikunja.maintain.svg)
+
 [![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)*
@@ -26,7 +27,7 @@ Vikunja is a self-hosted open-source to-do list application for all platforms.
 - CalDAV
 - Links  
 
-**Shipped version:** 0.20.2~ynh1
+**Shipped version:** 0.20.4~ynh1
 
 **Demo:** https://try.vikunja.io/login
 
@@ -34,14 +35,6 @@ Vikunja is a self-hosted open-source to-do list application for all platforms.
 
 ![Screenshot of Vikunja](./doc/screenshots/kanban.png)
 
-## Disclaimers / important information
-
-## Configuration
-
-You can configure Vikunja with the config panels in the webadmin or by editing this file `/opt/vikunja/config.yml` using the [documentation](https://vikunja.io/docs/config-options/).
-
-
-The API is accesible with this path: https://domain.ltd/api/v1/docs
 ## Documentation and resources
 
 * Official app website: <https://vikunja.io/>

README_fr.md

@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Vikunja pour YunoHost
 
 [![Niveau d’intégration](https://dash.yunohost.org/integration/vikunja.svg)](https://dash.yunohost.org/appci/app/vikunja) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/vikunja.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/vikunja.maintain.svg)
+
 [![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)*
@@ -26,7 +27,7 @@ Vikunja est une application de liste de tâches Open Source auto-hébergée pour
 - CalDAV
 - Links  
 
-**Version incluse :** 0.20.2~ynh1
+**Version incluse :** 0.20.4~ynh1
 
 **Démo :** https://try.vikunja.io/login
 
@@ -34,11 +35,6 @@ Vikunja est une application de liste de tâches Open Source auto-hébergée pour
 
 ![Capture d’écran de Vikunja](./doc/screenshots/kanban.png)
 
-## Avertissements / informations importantes
-
-## Configuration
-
-Vous pouvez configurer Vikunja avec les config panels ou en modifiant le fichier `/opt/vikunja/config.yml` en vous aidant de la [documentation](https://vikunja.io/docs/config-options/).
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://vikunja.io/>

check_process

@@ -1,26 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		path="/path"
-		is_public=1
-		admin="john"
-		password="password"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=0
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		upgrade=1   from_commit=b7c5209ca080054e8777c1882f4bf54851834270
-		backup_restore=1
-		multi_instance=1
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=b7c5209ca080054e8777c1882f4bf54851834270
-		name=Merge pull request #11 from YunoHost-Apps/testing
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=4533&

conf/amd64.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://dl.vikunja.io/api/0.20.2/vikunja-v0.20.2-linux-amd64-full.zip
-SOURCE_SUM=ce6f698134ac33ab307472ab6418043a7e92e1dbc917044f616c4bc6112e3ee0
-SOURCE_SUM_PRG=sha256sum
-SOURCE_IN_SUBDIR=false
-SOURCE_FORMAT=zip
-SOURCE_FILENAME=vikunja
-SOURCE_EXTRACT=true

conf/arm64.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://dl.vikunja.io/api/0.20.2/vikunja-v0.20.2-linux-arm64-full.zip
-SOURCE_SUM=80d217013b11e5e7b2c3be50186abca2d46dac122a45ac69dc5189f7a0163cf2
-SOURCE_SUM_PRG=sha256sum
-SOURCE_IN_SUBDIR=false
-SOURCE_FORMAT=zip
-SOURCE_FILENAME=vikunja
-SOURCE_EXTRACT=true

conf/armhf.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://dl.vikunja.io/api/0.20.2/vikunja-v0.20.2-linux-arm-7-full.zip
-SOURCE_SUM=dceace8dd44baa999ffeb7ff515c5d4108ad064553d58cb0254faed061661ff4
-SOURCE_SUM_PRG=sha256sum
-SOURCE_IN_SUBDIR=false
-SOURCE_FORMAT=zip
-SOURCE_FILENAME=vikunja
-SOURCE_EXTRACT=true

conf/front.src

@@ -1,6 +0,0 @@
-SOURCE_URL=https://dl.vikunja.io/frontend/vikunja-frontend-0.20.3.zip
-SOURCE_SUM=f95b5d81b25a5dc3e53bbd06aacbabea8b016fb880bd59cfbf689a1dbb364669
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
-SOURCE_IN_SUBDIR=false
-SOURCE_EXTRACT=true

conf/i386.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://dl.vikunja.io/api/0.20.2/vikunja-v0.20.2-linux-386-full.zip
-SOURCE_SUM=e334c4203de04cc38f3d123445a93cf1b8b945731302d49392e05faabd1844c6
-SOURCE_SUM_PRG=sha256sum
-SOURCE_IN_SUBDIR=false
-SOURCE_FORMAT=zip
-SOURCE_FILENAME=vikunja
-SOURCE_EXTRACT=true

conf/nginx.conf

@@ -1,7 +1,8 @@
-location / {
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/;
+  alias __INSTALL_DIR__/;
   
   try_files $uri $uri/ /;
 

doc/ADMIN.md

@@ -1,6 +1,4 @@
-## Configuration
-
 You can configure Vikunja with the config panels in the webadmin or by editing this file `/opt/vikunja/config.yml` using the [documentation](https://vikunja.io/docs/config-options/).
 
 
-The API is accesible with this path: https://domain.ltd/api/v1/docs
+The API is accesible with this path: https://__DOMAIN__/api/v1/docs

doc/ADMIN_fr.md

@@ -1,3 +1 @@
-## Configuration
-
 Vous pouvez configurer Vikunja avec les config panels ou en modifiant le fichier `/opt/vikunja/config.yml` en vous aidant de la [documentation](https://vikunja.io/docs/config-options/).

manifest.json

@@ -1,46 +0,0 @@
-{
-    "name": "Vikunja",
-    "id": "vikunja",
-    "packaging_format": 1,
-    "description": {
-        "en": "Self-hosted To-Do list application",
-        "fr": "Application de liste de tâches auto-hébergée"
-    },
-    "version": "0.20.2~ynh1",
-    "url": "https://vikunja.io/",
-    "upstream": {
-        "license": "GPL-3.0",
-        "website": "https://vikunja.io/",
-        "demo": "https://try.vikunja.io/login",
-        "admindoc": "https://vikunja.io/docs/",
-        "code": "https://kolaente.dev/vikunja/"
-    },
-    "license": "GPL-3.0",
-    "maintainer": {
-        "name": "eric_G"
-    },
-    "requirements": {
-        "yunohost": ">= 11.0.9"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install" : [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "help": {
-                    "en": "If enabled, Vikunja will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-                    "fr": "Si cette case est cochée, Vikunja sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
-                },
-                "default": true
-            }
-        ]
-    }
-}

manifest.toml

@@ -0,0 +1,75 @@
+packaging_format = 2
+
+id = "vikunja"
+name = "Vikunja"
+description.en = "Self-hosted To-Do list application"
+description.fr = "Application de liste de tâches auto-hébergée"
+
+version = "0.20.4~ynh1"
+
+maintainers = ["eric_G"]
+
+[upstream]
+license = "GPL-3.0"
+website = "https://vikunja.io/"
+demo = "https://try.vikunja.io/login"
+admindoc = "https://vikunja.io/docs/"
+code = "https://kolaente.dev/vikunja/"
+
+[integration]
+yunohost = ">= 11.1.17"
+architectures = "all"
+multi_instance = true
+ldap = false
+sso = false
+disk = "50M"
+ram.build = "1500M"
+ram.runtime = "50M"
+
+[install]
+    [install.domain]
+    type = "domain"
+    full_domain = true
+
+    [install.init_main_permission]
+    help.en = "If enabled, Vikunja will be accessible by people who do not have an account. This can be changed later via the webadmin."
+    help.fr = "Si cette case est cochée, Vikunja sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+    type = "group"
+    default = "visitors"
+
+[resources]
+
+    [resources.sources]
+        [resources.sources.back]
+        arm64.url = "https://dl.vikunja.io/api/0.20.4/vikunja-v0.20.4-linux-arm64-full.zip"
+        arm64.sha256 = "8d4c53dffc06484bd3d783dfd9c623f109ec116cbd00145b5e6c5756758c281d"
+        amd64.url = "https://dl.vikunja.io/api/0.20.4/vikunja-v0.20.4-linux-amd64-full.zip"
+        amd64.sha256 = "f4c9eea0bb0a05417ca4c40b55119c783e64732ce0e372198cb11c51a9914cdb"
+        armhf.url = "https://dl.vikunja.io/api/0.20.4/vikunja-v0.20.4-linux-arm-7-full.zip"
+        armhf.sha256 = "0746fdc6daa335629bf0330cf9ecb7255fa6e5b7ceb6c61bed19e456895c7c20"
+        i386.url = "https://dl.vikunja.io/api/0.20.4/vikunja-v0.20.4-linux-386-full.zip"
+        i386.sha256 = "7a24ba368c56c851c3a9e666dfc5baeb31bfaa411776caa9095ce2f87e8dcd85"
+        in_subdir = false
+        
+        [resources.sources.front]
+        url = "https://dl.vikunja.io/frontend/vikunja-frontend-0.20.5.zip"
+        sha256 = "7d458c95ac84f29c550469682ebcb05401425c5ff7be5af3fc21e31cd05aed4f"
+        in_subdir = false
+
+    [resources.ports]
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.permissions]
+    main.url = "/"
+    api.url = "/api"
+    api.show_tile = false
+    api.allowed = "visitors"
+
+    [resources.apt]
+    packages = "postgresql"
+
+    [resources.database]
+    type = "postgresql"

scripts/_common.sh

@@ -4,9 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies="postgresql"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/backup

@@ -9,25 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-backend_path=$(ynh_app_setting_get --app=$app --key=backend_path)
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -38,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 #=================================================
 
 # Frontend
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 # Backend
 ynh_backup --src_path="$backend_path"

scripts/change_url

@@ -9,75 +9,13 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
-
-app=$YNH_APP_INSTANCE_NAME
-
 #=================================================
 # LOAD SETTINGS
 #=================================================
-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)
-backend_path=$(ynh_app_setting_get --app=$app --key=backend_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-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)
 secret=$(ynh_string_random --length=32)
 timezone="$(cat /etc/timezone)"
-
+redis_db=$(ynh_redis_get_free_db)
-set_motd=$(ynh_app_setting_get --app=$app --key=set_motd)
-enable_registration=$(ynh_app_setting_get --app=$app --key=enable_registration)
-enable_linksharing=$(ynh_app_setting_get --app=$app --key=enable_linksharing)
-enable_taskattachments=$(ynh_app_setting_get --app=$app --key=enable_taskattachments)
-enable_taskcomments=$(ynh_app_setting_get --app=$app --key=enable_taskcomments)
-enable_emailreminders=$(ynh_app_setting_get --app=$app --key=enable_emailreminders)
-enable_userdeletion=$(ynh_app_setting_get --app=$app --key=enable_userdeletion)
-maxavatarsize=$(ynh_app_setting_get --app=$app --key=maxavatarsize)
-maxitemsperpage=$(ynh_app_setting_get --app=$app --key=maxitemsperpage)
-
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up $app before changing its URL (may take a while)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK WHICH PARTS SHOULD BE CHANGED
-#=================================================
-
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
-	change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
-	change_path=1
-fi
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -93,29 +31,7 @@ ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
+ynh_change_url_nginx_config
-
-# Change the path in the NGINX config file
-if [ $change_path -eq 1 ]
-then
-	# Make a backup of the original NGINX config file if modified
-	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for NGINX helper
-	domain="$old_domain"
-	path_url="$new_path"
-	# Create a dedicated NGINX config
-	ynh_add_nginx_config
-fi
-
-# Change the domain for NGINX
-if [ $change_domain -eq 1 ]
-then
-	# Delete file checksum for the old conf file location
-	ynh_delete_file_checksum --file="$nginx_conf_path"
-	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
-	# Store file checksum for the new config file location
-	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-fi
 
 #=================================================
 # ADD A CONFIGURATION
@@ -124,7 +40,6 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 domain="$new_domain"
 path="$new_path"
-redis_db=$(ynh_redis_get_free_db)
 ynh_add_config --template="../conf/config.yml" --destination="$backend_path/config.yml"
 
 chmod 600 "$backend_path/config.yml"
@@ -139,13 +54,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd
 
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/install

@@ -9,25 +9,13 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-domain=$YNH_APP_ARG_DOMAIN
-path_url="/"
-is_public=$YNH_APP_ARG_IS_PUBLIC
 timezone="$(cat /etc/timezone)"
 secret=$(ynh_string_random --length=32)
 
-app=$YNH_APP_INSTANCE_NAME
-
 set_motd=""
 enable_registration="true"
 enable_linksharing="true"
@@ -41,22 +29,13 @@ maxitemsperpage=50
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
 
-final_path=/var/www/$app
 backend_path=/opt/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=2
 
-ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path --value=$path_url
 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
@@ -67,55 +46,17 @@ ynh_app_setting_set --app=$app --key=enable_userdeletion --value=$enable_userdel
 ynh_app_setting_set --app=$app --key=maxavatarsize --value=$maxavatarsize
 ynh_app_setting_set --app=$app --key=maxitemsperpage --value=$maxitemsperpage
 
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Finding an available port..." --weight=0
-
-# Find an available port
-port=$(ynh_find_port --port=3456)
-ynh_app_setting_set --app=$app --key=port --value=$port
-
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=20
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir=$final_path
-
-#=================================================
-# CREATE A POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
-
-db_name=$(ynh_sanitize_dbid --db_name=$app)
-db_user=$db_name
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
-
 #=================================================
 # INSTALL FRONTEND
 #=================================================
 ynh_script_progression --message="Setting up frontend..." --weight=1
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # 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="$install_dir" --source_id="front"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+chown -R $app:www-data "$install_dir"
 
 #=================================================
 # INSTALL BACKEND
@@ -128,7 +69,7 @@ ynh_app_setting_set --app=$app --key=backend_path --value=$backend_path
 mkdir -p "$backend_path"
 mkdir -p "$backend_path/files"
 tempdir="$(mktemp -d)"
-ynh_setup_source --dest_dir=$tempdir --source_id=$YNH_ARCH
+ynh_setup_source --dest_dir=$tempdir --source_id="back"
 back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")"
 cp "$back" "$backend_path/vikunja"
 
@@ -176,26 +117,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd #--line_match="server started on"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-# Make app public if necessary or protect it
-if [ $is_public -eq 1 ]
-then
-	ynh_permission_update --permission="main" --add="visitors"
-fi
-
-ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --auth_header="false" --show_tile="false" --protected="true"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=2
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/remove

@@ -9,20 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get --app=$app --key=port)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-backend_path=$(ynh_app_setting_get --app=$app --key=backend_path)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
-
 #=================================================
 # STANDARD REMOVE
 #=================================================
@@ -44,22 +30,6 @@ ynh_script_progression --message="Stopping and removing the systemd service..."
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE THE POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Removing the PostgreSQL database..." --weight=2
-
-# Remove a database if it exists, along with the associated user
-ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
-
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
 #=================================================
 # REMOVE THE REDIS DATABASE
 #=================================================
@@ -72,9 +42,6 @@ ynh_redis_remove_db "$redis_db"
 #=================================================
 ynh_script_progression --message="Removing $app main directory..." --weight=6
 
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
 # Remove backend
 ynh_secure_remove --file="$backend_path"
 
@@ -86,16 +53,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -9,35 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-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)
-backend_path=$(ynh_app_setting_get --app=$app --key=backend_path)
-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)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=2
-
-test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
@@ -47,45 +18,27 @@ ynh_script_progression --message="Restoring the NGINX configuration..." --weight
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring $app main directory..." --weight=4
 
 # Frontend
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$final_path"
+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"
 
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=6
-
-# Define and install dependencies
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6
 
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
 
 #=================================================

scripts/upgrade

@@ -12,120 +12,72 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=2
 
-app=$YNH_APP_INSTANCE_NAME
-
-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)
-backend_path=$(ynh_app_setting_get --app=$app --key=backend_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-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)
 timezone="$(cat /etc/timezone)"
 secret=$(ynh_string_random --length=32)
 
-set_motd=$(ynh_app_setting_get --app=$app --key=set_motd)
-enable_registration=$(ynh_app_setting_get --app=$app --key=enable_registration)
-enable_linksharing=$(ynh_app_setting_get --app=$app --key=enable_linksharing)
-enable_taskattachments=$(ynh_app_setting_get --app=$app --key=enable_taskattachments)
-enable_taskcomments=$(ynh_app_setting_get --app=$app --key=enable_taskcomments)
-enable_emailreminders=$(ynh_app_setting_get --app=$app --key=enable_emailreminders)
-enable_userdeletion=$(ynh_app_setting_get --app=$app --key=enable_userdeletion)
-maxavatarsize=$(ynh_app_setting_get --app=$app --key=maxavatarsize)
-maxitemsperpage=$(ynh_app_setting_get --app=$app --key=maxitemsperpage)
-
-
 #=================================================
 # CHECK VERSION
 #=================================================
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=4
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # 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
+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
+if [ -z "${set_motd:-}" ]; then
 	set_motd=""
 	ynh_app_setting_set --app=$app --key=set_motd --value=$set_motd
 fi
 
-if [ -z "$enable_registration" ]; then
+if [ -z "${enable_registration:-}" ]; then
 	enable_registration="true"
 	ynh_app_setting_set --app=$app --key=enable_registration --value=$enable_registration
 fi
 
-if [ -z "$enable_linksharing" ]; then
+if [ -z "${enable_linksharing:-}" ]; then
 	enable_linksharing="true"
 	ynh_app_setting_set --app=$app --key=enable_linksharing --value=$enable_linksharing
 fi
 
-if [ -z "$enable_taskattachments" ]; then
+if [ -z "${enable_taskattachments:-}" ]; then
 	enable_taskattachments="true"
 	ynh_app_setting_set --app=$app --key=enable_taskattachments --value=$enable_taskattachments
 fi
 
-if [ -z "$enable_taskcomments" ]; then
+if [ -z "${enable_taskcomments:-}" ]; then
 	enable_taskcomments="true"
 	ynh_app_setting_set --app=$app --key=enable_taskcomments --value=$enable_taskcomments
 fi
 
-if [ -z "$enable_emailreminders" ]; then
+if [ -z "${enable_emailreminders:-}" ]; then
 	enable_emailreminders="true"
 	ynh_app_setting_set --app=$app --key=enable_emailreminders --value=$enable_emailreminders
 fi
 
-if [ -z "$enable_userdeletion" ]; then
+if [ -z "${enable_userdeletion:-}" ]; then
 	enable_userdeletion="true"
 	ynh_app_setting_set --app=$app --key=enable_userdeletion --value=$enable_userdeletion
 fi
 
-if [ -z "$maxavatarsize" ]; then
+if [ -z "${maxavatarsize:-}" ]; then
 	maxavatarsize=1024
 	ynh_app_setting_set --app=$app --key=maxavatarsize --value=$maxavatarsize
 fi
 
-if [ -z "$maxitemsperpage" ]; then
+if [ -z "${maxitemsperpage:-}" ]; then
 	maxitemsperpage=50
 	ynh_app_setting_set --app=$app --key=maxitemsperpage --value=$maxitemsperpage
 fi
 
-# Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
-
-	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
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -135,14 +87,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=stop --log_path=systemd
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -153,19 +97,18 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	# Frontend
-	ynh_setup_source --dest_dir="$final_path" --source_id="front"
+	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=$YNH_ARCH
+	ynh_setup_source --dest_dir=$tempdir --source_id="back"
 	back="$(find $tempdir -name "vikunja-*" \! -name "*.sha256")"
 	cp "$back" "$backend_path/vikunja"
 fi
 
-chmod 750 "$final_path"
+chmod -R o-rwx "$install_dir"
-chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$install_dir"
-chown -R $app:www-data "$final_path"
 chmod +x "$backend_path/vikunja"
 chown -R $app:www-data "$backend_path/files"
 
@@ -188,13 +131,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=10
-
-ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -216,13 +152,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server started on"
 
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

tests.toml

@@ -0,0 +1,13 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    # -------------------------------
+    # Commits to test upgrade from
+    # -------------------------------
+
+    test_upgrade_from.4cf807ee10e609d85147ac389ea7f62260c733b2.name = "Upgrade from 0.20.2"