Merge branch 'testing' into testing

README.md

@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Trilium Notes is an Evernote-like hierarchical note taking application with many advanced features, focused on building a large personal knowledge base.
 
 
-**Shipped version:** 0.59.1~ynh1
+**Shipped version:** 0.61.11~ynh1
 
 ## Screenshots
 
@@ -29,7 +29,7 @@ Trilium Notes is an Evernote-like hierarchical note taking application with many
 
 * Official admin documentation: <https://github.com/zadam/trilium/wiki>
 * Upstream app code repository: <https://github.com/zadam/trilium>
-* YunoHost documentation for this app: <https://yunohost.org/app_trilium>
+* YunoHost Store: <https://apps.yunohost.org/app/trilium>
 * Report a bug: <https://github.com/YunoHost-Apps/trilium_ynh/issues>
 
 ## Developer info

README_fr.md

@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Trilium Notes est une application de prise de note hiérarchique semblable a Evernote, avec maintes fonctions avancées, centrée sur la construction d'une large base de connaissances personnelle.
 
 
-**Version incluse :** 0.59.1~ynh1
+**Version incluse :** 0.61.11~ynh1
 
 ## Captures d’écran
 
@@ -29,7 +29,7 @@ Trilium Notes est une application de prise de note hiérarchique semblable a Eve
 
 * Documentation officielle de l’admin : <https://github.com/zadam/trilium/wiki>
 * Dépôt de code officiel de l’app : <https://github.com/zadam/trilium>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_trilium>
+* YunoHost Store: <https://apps.yunohost.org/app/trilium>
 * Signaler un bug : <https://github.com/YunoHost-Apps/trilium_ynh/issues>
 
 ## Informations pour les développeurs

conf/app.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/zadam/trilium/archive/refs/tags/v0.59.1.tar.gz
-SOURCE_SUM=b3e51ff0caf63a107decad5f70b37eb8fde6eef187f1f790474d550cf9eafbb4
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=v0.59.1.tar.gz
-SOURCE_EXTRACT=true

conf/nginx.conf

@@ -1,7 +1,7 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-  proxy_pass        http://127.0.0.1:__PORT__;
+  proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_redirect    off;
   proxy_set_header  Host $host;
   proxy_set_header  X-Real-IP $remote_addr;

conf/systemd.service

@@ -13,6 +13,7 @@ Environment=NODE_ENV=production
 Environment=TRILIUM_ENV=dev
 WorkingDirectory=__INSTALL_DIR__/
 ExecStart=__YNH_NODE__ __INSTALL_DIR__/src/www
+Restart=always
 
 
 # Sandboxing options to harden security

manifest.toml

@@ -5,7 +5,7 @@ name = "Trilium Notes"
 description.en = "Hierarchical note taking application with focus on building large personal knowledge base"
 description.fr = "Application de prise de note hiérarchique centrée sur la construction d'une large base de connaissances personnelle"
 
-version = "0.59.1~ynh1"
+version = "0.61.11~ynh1"
 
 maintainers = ["Jules Bertholet"]
 
@@ -17,8 +17,8 @@ cpe = "cpe:2.3:a:trilium_project:trilium"
 fund = "https://github.com/sponsors/zadam"
 
 [integration]
-yunohost = ">= 11.1.12"
+yunohost = ">= 11.2"
-architectures = "all"
+architectures = [ "amd64", "arm64", "armhf" ]
 multi_instance = true
 ldap = false
 sso = false
@@ -29,7 +29,10 @@ ram.runtime = "110M"
 [install]
     [install.domain]
     type = "domain"
-    full_domain = true
+
+    [install.path]
+    type = "path"
+    default = "/trilium"
 
     [install.init_main_permission]
     help.en = "Enabling visitors access is required for sync with desktop app"
@@ -47,6 +50,14 @@ ram.runtime = "110M"
 
 [resources]
 
+    [resources.sources]
+
+        [resources.sources.main]
+        url = "https://github.com/zadam/trilium/archive/refs/tags/v0.61.11.tar.gz"
+        sha256 = "8e689e26fe5ea3ea0f3e061e9176c50b9e6868f31a2675245425cbdd615c931a"
+        rename = "v0.60.4.tar.gz"
+        autoupdate.strategy = "latest_github_tag"
+
     [resources.system_user]
 
     [resources.install_dir]

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=16
+nodejs_version=18
 
 #=================================================
 # PERSONAL HELPERS

scripts/install

@@ -28,10 +28,7 @@ ynh_setup_source --dest_dir="$install_dir"
 
 grep -v electron "$install_dir/package.json" > "$install_dir/server-package.json"
 mv "$install_dir/server-package.json" "$install_dir/package.json"
-# $install_dir will automatically be initialized with some decent 
+
-# permission by default ... however, you may need to recursively reapply
-# ownership to all files such as after the ynh_setup_source step
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
@@ -68,8 +65,6 @@ yunohost service add $app --description="Trilium Notes app" --log="systemd"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-### You can add specific configuration files.
-
 ynh_add_config --template="../conf/config.ini" --destination="$install_dir/config.ini"
 ln -sf $install_dir/config.ini $data_dir/config.ini
 

scripts/remove

@@ -16,8 +16,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Removing system configurations related to $app..."
 
-# This should be a symetric version of what happens in the install script
-
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
 then

scripts/restore

@@ -17,9 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-# $install_dir will automatically be initialized with some decent 
-# permission by default ... however, you may need to recursively reapply
-# ownership to all files such as after the ynh_setup_source step
 chown -R $app:www-data "$install_dir"
 
 #=================================================
@@ -29,7 +26,6 @@ ynh_script_progression --message="Restoring the data directory..." --weight=50
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-# (Same as for install dir)
 chown -R $app:www-data "$data_dir"
 
 #=================================================
@@ -44,8 +40,6 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 ynh_script_progression --message="Restoring system configurations related to $app..." --weight=10
 
-# This should be a symetric version of what happens in the install script
-
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"

scripts/upgrade

@@ -35,9 +35,6 @@ then
 	mv "$install_dir/server-package.json" "$install_dir/package.json"
 fi
 
-# $install_dir will automatically be initialized with some decent 
-# permission by default ... however, you may need to recursively reapply
-# ownership to all files such as after the ynh_setup_source step
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -65,8 +62,6 @@ popd
 #=================================================
 ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
-# This should be a literal copypasta of what happened in the install's "System configuration" section
-
 ynh_add_nginx_config
 
 ynh_add_systemd_config

tests.toml

@@ -6,4 +6,4 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.fac7d16.name = "Merge pull request #40 from YunoHost-Apps/testing"
+    test_upgrade_from.fac7d16.name = "Merge pull request #40 from YunoHost-Apps/testing"