diff --git a/README.md b/README.md index 6e1c4bb..673c6ed 100644 --- a/README.md +++ b/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.58.8~ynh1 +**Shipped version:** 0.59.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a6ed6a2..b9769cc 100644 --- a/README_fr.md +++ b/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.58.8~ynh1 +**Version incluse :** 0.59.2~ynh1 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index a8e36f3..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/zadam/trilium/archive/refs/tags/v0.58.8.tar.gz -SOURCE_SUM=a4b8d062bfacaa47bcde6356c8a5be0fe114f3f8db78c697e7f6cc4a72c03593 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=v0.58.8.tar.gz -SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 061375b..ac71459 100644 --- a/conf/nginx.conf +++ b/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; diff --git a/conf/systemd.service b/conf/systemd.service index 616c04c..d12e7de 100644 --- a/conf/systemd.service +++ b/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 diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index c02d007..363504a 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,2 +1 @@ - On vous demandera de choisir un mot de passe quand vous installez l'application. Vous pouvez configurer Trillium depuis le menu de configuration de l'interface web. diff --git a/manifest.toml b/manifest.toml index 087ef5d..e470883 100644 --- a/manifest.toml +++ b/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.58.8~ynh1" +version = "0.59.2~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.11.1" -architectures = [ "amd64" ] +yunohost = ">= 11.1.15" +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,13 @@ ram.runtime = "110M" [resources] + [resources.sources] + + [resources.sources.main] + url = "https://github.com/zadam/trilium/archive/refs/tags/v0.59.2.tar.gz" + sha256 = "29dfd218cfc9f1263e2c38fa098ce7363cbf9bc802ff9776a675159dc8b6f368" + rename = "v0.59.2.tar.gz" + [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index f059f51..dc560e8 100644 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ popd #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config using the conf/nginx.conf template ynh_add_nginx_config