From a6af5b76dbfae8a06df2cb33abe36c6204efc2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:33:52 +0200 Subject: [PATCH 01/71] restart config panel --- config_panel.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config_panel.toml b/config_panel.toml index 77de992..e10ea28 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,6 +2,7 @@ version = "1.0" [main] name = "BookStack configuration" +services = ["__APP__"] [main.auth_config] name = "Authentication configuration" From 474a69b19a1249b1ae226723a8b3d471070ad7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:57:31 +0200 Subject: [PATCH 02/71] Update manifest.toml --- manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index 5021fed..a44a548 100644 --- a/manifest.toml +++ b/manifest.toml @@ -67,6 +67,10 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + api.url = "/api" + api.show_tile = false + api.allowed = "visitors" + api.auth_header = false [resources.apt] packages = "mariadb-server, php8.2-curl, php8.2-mysql, php8.2-ldap, php8.2-mbstring, php8.2-tidy, php8.2-xml, php8.2-zip, php8.2-gd" From 3290278891ab576a4d0c586d54c4583ea4f58499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:12:29 +0200 Subject: [PATCH 03/71] Standard (#119) * fix * Update manifest.toml * Update manifest.toml * Update POST_INSTALL.md * Update POST_INSTALL_fr.md --- config_panel.toml | 11 ----------- doc/POST_INSTALL.md | 5 +---- doc/POST_INSTALL_fr.md | 5 +---- manifest.toml | 7 +++++++ scripts/install | 2 -- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index e10ea28..143cbd3 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,17 +2,6 @@ version = "1.0" [main] name = "BookStack configuration" -services = ["__APP__"] - - [main.auth_config] - name = "Authentication configuration" - - [main.auth_config.auth_method] - ask = "General authentication" - choices = ["standard", "ldap"] - default = "ldap" - help = "Select an authentication method to connect to BookStack." - bind = "AUTH_METHOD:/var/www/__APP__/.env" [main.php_fpm_config] name = "PHP-FPM configuration" diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index c286b1c..f3a33e2 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,5 +1,2 @@ BookStack uses LDAP authentication by default. - -You can switch to standard authentication in the webadmin -> bookstack -> config panel setting. - -For the first time Login with standard authentication, use the default credentials `admin@admin.com` and `password`. You should change these details immediately after logging in for the first time. +If you choose Standard as authentication, for the first time Login with standard authentication, use the default credentials `admin@admin.com` and `password`. You should change these details immediately after logging in for the first time. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 6751601..bed1acd 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,5 +1,2 @@ BookStack utilise l'authentification LDAP par défaut. - -Vous pouvez passer à l'authentification standard dans le webadmin -> Bookstack -> paramètre du panneau de configuration. - -Pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois. +Si vous avez choisi la méthode standard d'authentification, pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois. diff --git a/manifest.toml b/manifest.toml index a44a548..0cee4b5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -38,6 +38,13 @@ ram.runtime = "50M" [install.admin] type = "user" + [install.auth_method] + ask.en = "Choose an authentication method" + ask.fr = "Choisissez une méthode d'authentification" + type = "string" + choices = ["standard", "ldap"] + default = "ldap" + [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" diff --git a/scripts/install b/scripts/install index eec4f89..40bff2c 100644 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,6 @@ timezone="$(cat /etc/timezone)" redis_db=$(ynh_redis_get_free_db) email=$(ynh_user_get_info --username=$admin --key=mail) -auth_method="ldap" fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" @@ -27,7 +26,6 @@ fpm_usage="low" #================================================= ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db -ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage From 9ec6b3a13da89de012c448b65ca9189e63238eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:21:24 +0200 Subject: [PATCH 04/71] fix --- doc/POST_INSTALL.md | 1 + doc/POST_INSTALL_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index f3a33e2..e9ce5f7 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,2 +1,3 @@ BookStack uses LDAP authentication by default. + If you choose Standard as authentication, for the first time Login with standard authentication, use the default credentials `admin@admin.com` and `password`. You should change these details immediately after logging in for the first time. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index bed1acd..4e3cb67 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,2 +1,3 @@ BookStack utilise l'authentification LDAP par défaut. + Si vous avez choisi la méthode standard d'authentification, pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois. From 9f716ffa6ac889b0f161334999f8392daca62379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:22:17 +0200 Subject: [PATCH 05/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0cee4b5..5322121 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.05.2~ynh1" +version = "23.05.2~ynh2" maintainers = ["eric_G"] From 3bf7a01d198ded65d4de43c3e2879b9bedde2077 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 7 Jun 2023 12:22:22 +0000 Subject: [PATCH 06/71] 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 bc1cd4a..6d7d62c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.05.2~ynh1 +**Shipped version:** 23.05.2~ynh2 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 914b67f..b9ec898 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.05.2~ynh1 +**Version incluse :** 23.05.2~ynh2 **Démo :** https://demo.bookstackapp.com From 75686d6d39b790aba218a726bbd8dab4a07fb57b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:23:49 +0200 Subject: [PATCH 07/71] Update tests.toml --- tests.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests.toml b/tests.toml index 205d217..989c73e 100644 --- a/tests.toml +++ b/tests.toml @@ -6,6 +6,12 @@ test_format = 1.0 # Default args to use for install # ------------------------------- + args.auth_method = "ldap" + + # ------------------------------- + # Default args to use for install + # ------------------------------- + exclude = ["install.nourl"] # ------------------------------- From 1a3a940c469a23aea349a4e1e01985b24e4be44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 7 Jun 2023 14:26:26 +0200 Subject: [PATCH 08/71] Update tests.toml --- tests.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests.toml b/tests.toml index 989c73e..cc09f90 100644 --- a/tests.toml +++ b/tests.toml @@ -19,3 +19,9 @@ test_format = 1.0 # ------------------------------- test_upgrade_from.d653976.name = "Upgrade from 23.01" + +[standard_auth_method] + + only = ["install.subdir", "backup_restore", "upgrade"] + + args.auth_method = "standard" From 8c9eaeec8d9e82244450754e90dceb513723ba4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:19:20 +0200 Subject: [PATCH 09/71] remove standard --- conf/.env.example | 2 +- doc/POST_INSTALL.md | 3 --- doc/POST_INSTALL_fr.md | 3 --- manifest.toml | 7 ------- scripts/upgrade | 6 ------ 5 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 doc/POST_INSTALL.md delete mode 100644 doc/POST_INSTALL_fr.md diff --git a/conf/.env.example b/conf/.env.example index a0f8a59..f98ee6e 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -57,7 +57,7 @@ MAIL_PASSWORD=null MAIL_ENCRYPTION=null # General auth -AUTH_METHOD=__AUTH_METHOD__ +AUTH_METHOD=ldap # LDAP authentication configuration # Refer to https://www.bookstackapp.com/docs/admin/ldap-auth/ diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md deleted file mode 100644 index e9ce5f7..0000000 --- a/doc/POST_INSTALL.md +++ /dev/null @@ -1,3 +0,0 @@ -BookStack uses LDAP authentication by default. - -If you choose Standard as authentication, for the first time Login with standard authentication, use the default credentials `admin@admin.com` and `password`. You should change these details immediately after logging in for the first time. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md deleted file mode 100644 index 4e3cb67..0000000 --- a/doc/POST_INSTALL_fr.md +++ /dev/null @@ -1,3 +0,0 @@ -BookStack utilise l'authentification LDAP par défaut. - -Si vous avez choisi la méthode standard d'authentification, pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois. diff --git a/manifest.toml b/manifest.toml index 5322121..c741735 100644 --- a/manifest.toml +++ b/manifest.toml @@ -38,13 +38,6 @@ ram.runtime = "50M" [install.admin] type = "user" - [install.auth_method] - ask.en = "Choose an authentication method" - ask.fr = "Choisissez une méthode d'authentification" - type = "string" - choices = ["standard", "ldap"] - default = "ldap" - [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" diff --git a/scripts/upgrade b/scripts/upgrade index 397512a..4602a18 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,12 +38,6 @@ if [ -z "${fpm_usage:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi -# If auth_method doesn't exist, create it -if [ -z "${auth_method:-}" ]; then - auth_method="standard" - ynh_app_setting_set --app=$app --key=auth_method --value=$auth_method -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From 8d27df32f8e15a330c90cdcf4466de51813504bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:20:42 +0200 Subject: [PATCH 10/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c741735..84a5283 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.05.2~ynh2" +version = "23.05.2~ynh3" maintainers = ["eric_G"] From 35c3d9340591fa26d3a3a572ee4790da4f7670f2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Jun 2023 12:20:48 +0000 Subject: [PATCH 11/71] 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 6d7d62c..d125b25 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.05.2~ynh2 +**Shipped version:** 23.05.2~ynh3 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index b9ec898..dd87429 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.05.2~ynh2 +**Version incluse :** 23.05.2~ynh3 **Démo :** https://demo.bookstackapp.com From 81536d611d8f5be48fcca9d791f8cbc32ec64fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 8 Jun 2023 15:25:42 +0200 Subject: [PATCH 12/71] Update tests.toml --- tests.toml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tests.toml b/tests.toml index cc09f90..96a81d2 100644 --- a/tests.toml +++ b/tests.toml @@ -6,22 +6,5 @@ test_format = 1.0 # Default args to use for install # ------------------------------- - args.auth_method = "ldap" - - # ------------------------------- - # Default args to use for install - # ------------------------------- - exclude = ["install.nourl"] - # ------------------------------- - # Commits to test upgrade from - # ------------------------------- - - test_upgrade_from.d653976.name = "Upgrade from 23.01" - -[standard_auth_method] - - only = ["install.subdir", "backup_restore", "upgrade"] - - args.auth_method = "standard" From 24f32813e60437967a6d969783033048cef2b90a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 14 Jun 2023 14:09:41 +0200 Subject: [PATCH 13/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 84a5283..65633d2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/" code = "https://github.com/BookStackApp/BookStack" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.20" architectures = "all" multi_instance = true ldap = true From 470173641bcf41402093557b0a5de70c9caf53a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:40:02 +0200 Subject: [PATCH 14/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 65633d2..3529910 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/" code = "https://github.com/BookStackApp/BookStack" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = true From 9f79624a7f464892718bdca1be1e94badb6a5d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:29:58 +0200 Subject: [PATCH 15/71] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 40bff2c..5bc5ef2 100644 --- a/scripts/install +++ b/scripts/install @@ -58,7 +58,7 @@ ynh_add_systemd_config yunohost service add $app --description="BookStack Queue Worker" --log="/var/log/$app/$app.log" #================================================= -# INSTALL LYCHEE WITH COMPOSER +# INSTALL BOOKSTACK WITH COMPOSER #================================================= ynh_script_progression --message="Installing BookStack with Composer..." --weight=5 From 76831c6646525ba0c65e0a1a276edfaf2a96a30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 30 Jun 2023 13:51:57 +0200 Subject: [PATCH 16/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3529910..bc3098b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.05.2~ynh3" +version = "23.06~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.05.2.tar.gz" - sha256 = "8baa11ec1e6fa4c4c8b9c5e8334197bb31382e315985828e0e7a449898460b04" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.06.tar.gz" + sha256 = "2d4462cc40ca715aed132fcb6b50f982cb9b2744c9c1ae2c2e0abc80477e3235" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 7c23cc08939cfac4841101142498e9c519332f7b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 30 Jun 2023 11:52:02 +0000 Subject: [PATCH 17/71] 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 d125b25..79d5396 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.05.2~ynh3 +**Shipped version:** 23.06~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index dd87429..192d5ab 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.05.2~ynh3 +**Version incluse :** 23.06~ynh1 **Démo :** https://demo.bookstackapp.com From aa03e7c09a33a96cd2aebff3f7459ad540d20ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 5 Jul 2023 18:39:37 +0200 Subject: [PATCH 18/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index bc3098b..70b33c1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06~ynh1" +version = "23.06.1~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.06.tar.gz" - sha256 = "2d4462cc40ca715aed132fcb6b50f982cb9b2744c9c1ae2c2e0abc80477e3235" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.06.1.tar.gz" + sha256 = "4f22cb92f5ea74192c8b1e29d86e5ef08e23a33f4a0f70cd75fa64b3a834d5e9" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From eb9bbe1a87140ba975e228da984c92088da2cb1f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 5 Jul 2023 16:39:42 +0000 Subject: [PATCH 19/71] 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 79d5396..73e9c9c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06~ynh1 +**Shipped version:** 23.06.1~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 192d5ab..eecfbf9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06~ynh1 +**Version incluse :** 23.06.1~ynh1 **Démo :** https://demo.bookstackapp.com From d75242fe85c5ae24b7d7aed137ead11b2d092472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:12:23 +0200 Subject: [PATCH 20/71] cleaning --- scripts/_common.sh | 2 +- scripts/install | 4 +++- scripts/upgrade | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a6dc845..d387e9f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_COMPOSER_VERSION=2.4.2 +YNH_COMPOSER_VERSION=2.5.8 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 5bc5ef2..8a23e4d 100644 --- a/scripts/install +++ b/scripts/install @@ -39,6 +39,8 @@ ynh_setup_source --dest_dir="$install_dir" # Set permissions to app files chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads + chown -R $app:www-data $install_dir #================================================= @@ -74,7 +76,7 @@ app_url_domain="https://$domain${path%/}" ynh_add_config --template=../conf/.env.example --destination=$install_dir/.env -chmod 600 $install_dir/.env +chmod 640 $install_dir/.env chown $app:$app $install_dir/.env #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4602a18..0d5d5d1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,6 +51,7 @@ then fi chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads chown -R $app:www-data $install_dir #================================================= From 4faf195fff995dd4d7a39d0a7c65c6ee3dcceeb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:12:46 +0200 Subject: [PATCH 21/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 70b33c1..5dfe325 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06.1~ynh1" +version = "23.06.1~ynh2" maintainers = ["eric_G"] From 5b7648d836352128011222e9a10a28d98812cf3c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 6 Jul 2023 18:12:51 +0000 Subject: [PATCH 22/71] 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 73e9c9c..1eb60b2 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06.1~ynh1 +**Shipped version:** 23.06.1~ynh2 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index eecfbf9..b65c900 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06.1~ynh1 +**Version incluse :** 23.06.1~ynh2 **Démo :** https://demo.bookstackapp.com From 7459a9089bee92abe8e66fe56d7289e37324709a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 13 Jul 2023 06:37:58 +0200 Subject: [PATCH 23/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5dfe325..0c5e619 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06.1~ynh2" +version = "23.06.2~ynh1" maintainers = ["eric_G"] From 42ae784100a7a05aa3767ba1880e88998795d04f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Jul 2023 04:38:03 +0000 Subject: [PATCH 24/71] 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 1eb60b2..d5967a6 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06.1~ynh2 +**Shipped version:** 23.06.2~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index b65c900..ff20744 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06.1~ynh2 +**Version incluse :** 23.06.2~ynh1 **Démo :** https://demo.bookstackapp.com From f5d0a0e3c20363d25c843b25a532cce16b4a9d13 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 14 Jul 2023 07:59:04 +0200 Subject: [PATCH 25/71] Upgrade to v23.6.2 (#128) * Upgrade to v23.6.2 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d5967a6..9d69373 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06.2~ynh1 +**Shipped version:** 23.6.2~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index ff20744..e8a6131 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06.2~ynh1 +**Version incluse :** 23.6.2~ynh1 **Démo :** https://demo.bookstackapp.com diff --git a/manifest.toml b/manifest.toml index 0c5e619..8fea45c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06.2~ynh1" +version = "23.6.2~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.06.1.tar.gz" - sha256 = "4f22cb92f5ea74192c8b1e29d86e5ef08e23a33f4a0f70cd75fa64b3a834d5e9" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.06.2.tar.gz" + sha256 = "5035add6d4dce199beff8cfde5b7ea57664cd761eb5b9062ddb9a36525cb076b" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 2fdd979ea30998b9e879ba179e26c3faa1084fcb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 14 Jul 2023 06:00:52 +0000 Subject: [PATCH 26/71] Auto-update README --- README_fr.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 04396a1..ff20744 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,6 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate **Version incluse :** 23.06.2~ynh1 - **Démo :** https://demo.bookstackapp.com ## Captures d’écran From e61dea3910f84162ece05d891d8df9949c0a0838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 17 Aug 2023 14:41:32 +0200 Subject: [PATCH 27/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 936d6a7..7b37d2d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/" code = "https://github.com/BookStackApp/BookStack" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true From 0d8ae4a981d9f0795fd0c4700651681a43f55925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:33:19 +0200 Subject: [PATCH 28/71] Add maintenance --- config_panel.toml | 8 ++++++++ scripts/config | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/config_panel.toml b/config_panel.toml index 143cbd3..29d256b 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -3,6 +3,14 @@ version = "1.0" [main] name = "BookStack configuration" + [main.maintenance_mode] + name = "Maintenance mode" + + [main.maintenance_mode.maintenance_mode] + ask = "Enable maintenance mode" + type = "boolean" + default = "0" + [main.php_fpm_config] name = "PHP-FPM configuration" diff --git a/scripts/config b/scripts/config index 91c2de7..0a9e083 100644 --- a/scripts/config +++ b/scripts/config @@ -22,6 +22,16 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) # SPECIFIC GETTERS FOR TOML SHORT KEY #================================================= +get__maintenance_mode() { + # Maintenance mode status + if [ -f $final_path/.maintenance ] + then + echo "1" + else + echo "0" + fi +} + get__fpm_footprint() { # Free footprint value for php-fpm # Check if current_fpm_footprint is an integer @@ -49,6 +59,20 @@ get__free_footprint() { # SPECIFIC SETTERS FOR TOML SHORT KEYS #================================================= +set__maintenance_mode() { + if [ "$maintenance_mode" -eq "1" ]; then + # If maintenance_mode was set to 1, enable maintenance mode + (cd "$final_path" && ynh_exec_as "$app" \ + echo "Site under maintenance." > .maintenance) + ynh_print_info "Maintenance mode disabled" + elif [ "$maintenance_mode" -eq "0" ]; then + # If maintenance_mode was set to 0, disable maintenance mode + ynh_secure_remove --file=$final_path/.maintenance + ynh_print_info "Maintenance mode enabled" + fi + ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" +} + set__fpm_footprint() { if [ "$fpm_footprint" != "specific" ] then From e877b69a8363334733e12867b662f783d08f59ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:38:51 +0200 Subject: [PATCH 29/71] Update config_panel.toml --- config_panel.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config_panel.toml b/config_panel.toml index 29d256b..c832ec7 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,6 +2,7 @@ version = "1.0" [main] name = "BookStack configuration" +services = ["nginx", "__APP__"] [main.maintenance_mode] name = "Maintenance mode" From aeedc035906257e81a11862e408e020b4afbb662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:43:13 +0200 Subject: [PATCH 30/71] Update config --- scripts/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config b/scripts/config index 0a9e083..c13b81b 100644 --- a/scripts/config +++ b/scripts/config @@ -24,7 +24,7 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) get__maintenance_mode() { # Maintenance mode status - if [ -f $final_path/.maintenance ] + if [ -f $install_dir/.maintenance ] then echo "1" else @@ -62,12 +62,12 @@ get__free_footprint() { set__maintenance_mode() { if [ "$maintenance_mode" -eq "1" ]; then # If maintenance_mode was set to 1, enable maintenance mode - (cd "$final_path" && ynh_exec_as "$app" \ + (cd "$install_dir" && ynh_exec_as "$app" \ echo "Site under maintenance." > .maintenance) ynh_print_info "Maintenance mode disabled" elif [ "$maintenance_mode" -eq "0" ]; then # If maintenance_mode was set to 0, disable maintenance mode - ynh_secure_remove --file=$final_path/.maintenance + ynh_secure_remove --file=$install_dir/.maintenance ynh_print_info "Maintenance mode enabled" fi ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" From 3c42b2c2aa37c6e7a626772c57fbaed039977ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:03:47 +0200 Subject: [PATCH 31/71] Update config_panel.toml --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index c832ec7..e7e457d 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -2,7 +2,7 @@ version = "1.0" [main] name = "BookStack configuration" -services = ["nginx", "__APP__"] +services = ["__APP__"] [main.maintenance_mode] name = "Maintenance mode" From 220087a71f990847aa21e0d55f870ca112607f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:05:10 +0200 Subject: [PATCH 32/71] Update config --- scripts/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/config b/scripts/config index c13b81b..2052133 100644 --- a/scripts/config +++ b/scripts/config @@ -17,6 +17,8 @@ ynh_abort_if_errors phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY From c7c7f5f44f86bcee5c442c7ba8143e1c642d7941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:06:12 +0200 Subject: [PATCH 33/71] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7b37d2d..262c876 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,8 +46,8 @@ ram.runtime = "50M" default = "en" [install.init_main_permission] - help.en = "If enabled, BookStack 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, BookStack sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + help.en = "Si défini sur visiteurs, BookStack will be accessible by people who do not have an account. This can be changed later via the webadmin." + help.fr = "Si visiteurs selectionné, BookStack sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" From 2f4e5b90bb7c67dc7051d630ac0026b310cde489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:52:33 +0200 Subject: [PATCH 34/71] Update config --- scripts/config | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/config b/scripts/config index 2052133..fbc1ab4 100644 --- a/scripts/config +++ b/scripts/config @@ -17,7 +17,6 @@ ynh_abort_if_errors phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= From 7196443641ddcc07fd93996b6030b5b18983a691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:03:55 +0200 Subject: [PATCH 35/71] Update config --- scripts/config | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/config b/scripts/config index fbc1ab4..c13b81b 100644 --- a/scripts/config +++ b/scripts/config @@ -17,7 +17,6 @@ ynh_abort_if_errors phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY From acb7ff1df771238cbcbbf03b35861312d159f471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:04:39 +0200 Subject: [PATCH 36/71] fix --- config_panel.toml => config_panel.toml.example | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config_panel.toml => config_panel.toml.example (100%) diff --git a/config_panel.toml b/config_panel.toml.example similarity index 100% rename from config_panel.toml rename to config_panel.toml.example From 0a92bb846eb5e5ff99ab3b6be0131bd00215aa14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 14:37:37 +0200 Subject: [PATCH 37/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 262c876..c51120d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06.2~ynh1" +version = "23.06.2~ynh2" maintainers = ["eric_G"] From e02ceae43c494c3bb99e6df95afbcbafe444d0cf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 28 Aug 2023 12:37:41 +0000 Subject: [PATCH 38/71] 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 d5967a6..05100a5 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06.2~ynh1 +**Shipped version:** 23.06.2~ynh2 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index ff20744..1da2ff4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06.2~ynh1 +**Version incluse :** 23.06.2~ynh2 **Démo :** https://demo.bookstackapp.com From 93355759656d82f588f3ee9e493139477e36ac06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:31:20 +0200 Subject: [PATCH 39/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c51120d..cb24125 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.06.2~ynh2" +version = "23.08~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.06.2.tar.gz" - sha256 = "5035add6d4dce199beff8cfde5b7ea57664cd761eb5b9062ddb9a36525cb076b" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.tar.gz" + sha256 = "47e4d5c7ff58d83fd18a9e63d8cffcdf6f8549a1c176b259c794d08eced12a2d" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 496dc5779459b047831fcc8f50dad879c706d97a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 30 Aug 2023 12:31:24 +0000 Subject: [PATCH 40/71] 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 05100a5..0d5336a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.06.2~ynh2 +**Shipped version:** 23.08~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 1da2ff4..571ba03 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.06.2~ynh2 +**Version incluse :** 23.08~ynh1 **Démo :** https://demo.bookstackapp.com From efe04658123b1e360fe9e1de44dfe3717f022884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Sep 2023 19:10:34 +0200 Subject: [PATCH 41/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index cb24125..1db1c97 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08~ynh1" +version = "23.08.1~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.tar.gz" - sha256 = "47e4d5c7ff58d83fd18a9e63d8cffcdf6f8549a1c176b259c794d08eced12a2d" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.1.tar.gz" + sha256 = "c8dffe68a0292bfa98715e6431a0e8693f420acc3a6bdcf9daddbc0357d23573" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 90e19688166779c13c9680fe36c7c7929f39ffb4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 3 Sep 2023 17:10:39 +0000 Subject: [PATCH 42/71] 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 0d5336a..06b0595 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.08~ynh1 +**Shipped version:** 23.08.1~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 571ba03..3e0d30d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.08~ynh1 +**Version incluse :** 23.08.1~ynh1 **Démo :** https://demo.bookstackapp.com From 4ef0510b5048b5e10d6271d47a524c815fedc2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:05:29 +0200 Subject: [PATCH 43/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1db1c97..66dd6ef 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,7 +41,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["de", "en", "es_ES", "fa", "fr", "it", "lt", "nl", "pl", "pt_PT", "uk", "zh_CN"] default = "en" From 0e7eaed3fc07c0851b957e03a83f65aa4daeaf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:19:18 +0200 Subject: [PATCH 44/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 66dd6ef..95c923e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08.1~ynh1" +version = "23.08.2~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.1.tar.gz" - sha256 = "c8dffe68a0292bfa98715e6431a0e8693f420acc3a6bdcf9daddbc0357d23573" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.2.tar.gz" + sha256 = "48503ebeb3da21e25f60559b2ef73ca5c45c988eb1c25c83e08b289656e9461b" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From c98cfa3f869400abcf14d95d204567ec087d1249 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Sep 2023 17:19:23 +0000 Subject: [PATCH 45/71] 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 06b0595..81ef1dc 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.08.1~ynh1 +**Shipped version:** 23.08.2~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 3e0d30d..bd10b2c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.08.1~ynh1 +**Version incluse :** 23.08.2~ynh1 **Démo :** https://demo.bookstackapp.com From 3191c1f3aead26c645eea7db8a3501f0c2e5c2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:20:25 +0200 Subject: [PATCH 46/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 95c923e..69dd0f7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08.2~ynh1" +version = "23.08.3~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.2.tar.gz" - sha256 = "48503ebeb3da21e25f60559b2ef73ca5c45c988eb1c25c83e08b289656e9461b" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.3.tar.gz" + sha256 = "da665584507020a071d41c6fef5f3996254854e13700059d6e9ca18c3f29211e" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 2fc13569afd92fb5352740a6f6ec1a6df6033348 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 15 Sep 2023 13:20:31 +0000 Subject: [PATCH 47/71] 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 81ef1dc..dab8782 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.08.2~ynh1 +**Shipped version:** 23.08.3~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index bd10b2c..7fcf640 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.08.2~ynh1 +**Version incluse :** 23.08.3~ynh1 **Démo :** https://demo.bookstackapp.com From 2ed9fbd65b53f01b8612536f3369a560e5481c68 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 8 Oct 2023 18:24:47 +0200 Subject: [PATCH 48/71] Mail (#139) * fix mail * Auto-update README * Update .env.example * Update .env.example * Update .env.example * Update .env.example * Update .env.example --------- Co-authored-by: yunohost-bot --- README.md | 1 - README_fr.md | 1 - conf/.env.example | 29 ++++++++++++++++++----------- manifest.toml | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index dab8782..60dbd71 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 7fcf640..3d85783 100644 --- a/README_fr.md +++ b/README_fr.md @@ -41,7 +41,6 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs diff --git a/conf/.env.example b/conf/.env.example index f98ee6e..48aac0b 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -16,9 +16,17 @@ APP_ENV=production APP_DEBUG=false # Application key +# Used for encryption where needed. +# Run `php artisan key:generate` to generate a valid key. APP_KEY=SomeRandomString # Application URL +# This must be the root URL that you want to host BookStack on. +# All URLs in BookStack will be generated using this value +# to ensure URLs generated are consistent and secure. +# If you change this in the future you may need to run a command +# to update stored URLs in the database. Command example: +# php artisan bookstack:update-url https://old.example.com https://new.example.com APP_URL=__APP_URL_DOMAIN__ # Application default language @@ -41,20 +49,19 @@ DB_PASSWORD=__DB_PWD__ FILE_UPLOAD_SIZE_LIMIT=100 # Mail system to use -MAIL_DRIVER=smtp +# Can be 'smtp' or 'sendmail' +MAIL_DRIVER=sendmail -# Mail sender details +MAIL_DRIVER=sendmail + +# The "from" email address for outgoing email +MAIL_FROM=noreply@__DOMAIN__ + +# The "from" name used for outgoing email MAIL_FROM_NAME=BookStack -MAIL_FROM=bookstack@__DOMAIN__ -# SMTP mail options -# These settings can be checked using the "Send a Test Email" -# feature found in the "Settings > Maintenance" area of the system. -MAIL_HOST=localhost -MAIL_PORT=25 -MAIL_USERNAME=bookstack -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null +# The command to use for calling sendmail +MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs" # General auth AUTH_METHOD=ldap diff --git a/manifest.toml b/manifest.toml index 69dd0f7..5ef8cfb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,6 +62,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] + allow_email = true [resources.install_dir] From db1f44a27438a655a73b413df2e93b53c1146228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 8 Oct 2023 18:25:25 +0200 Subject: [PATCH 49/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5ef8cfb..9f12253 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08.3~ynh1" +version = "23.08.3~ynh2" maintainers = ["eric_G"] From 58583f611b5328216a643870a038a339043e9472 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 8 Oct 2023 16:25:30 +0000 Subject: [PATCH 50/71] 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 60dbd71..650a3c9 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.08.3~ynh1 +**Shipped version:** 23.08.3~ynh2 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 3d85783..7eb9a3a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.08.3~ynh1 +**Version incluse :** 23.08.3~ynh2 **Démo :** https://demo.bookstackapp.com From 5bd4d1265a33879ed6ac7105937185f5dd015434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 8 Oct 2023 18:26:44 +0200 Subject: [PATCH 51/71] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 9f12253..0759614 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,7 +62,6 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_tag" [resources.system_user] - allow_email = true [resources.install_dir] From d7796afb5e16be4815dc35badc13b3ed1eddcb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:59:07 +0200 Subject: [PATCH 52/71] Update install --- scripts/install | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 8a23e4d..51a3fe2 100644 --- a/scripts/install +++ b/scripts/install @@ -37,12 +37,6 @@ ynh_script_progression --message="Setting up source files..." --weight=7 ynh_setup_source --dest_dir="$install_dir" -# Set permissions to app files -chmod -R o-rwx $install_dir -chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads - -chown -R $app:www-data $install_dir - #================================================= # SYSTEM CONFIGURATION #================================================= @@ -90,6 +84,11 @@ pushd $install_dir php$phpversion artisan bookstack:create-admin --email="$email" --name="$admin" --external-auth-id="$admin" popd +# Set permissions to app files +chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads +chown -R $app:www-data $install_dir + #================================================= # START SYSTEMD SERVICE #================================================= From 02891bf06d34eac5dee4a733b018acec2e049dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:09:28 +0200 Subject: [PATCH 53/71] fix --- scripts/install | 5 ++++- scripts/restore | 3 ++- scripts/upgrade | 12 ++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 51a3fe2..2bdb5b4 100644 --- a/scripts/install +++ b/scripts/install @@ -84,7 +84,10 @@ pushd $install_dir php$phpversion artisan bookstack:create-admin --email="$email" --name="$admin" --external-auth-id="$admin" popd -# Set permissions to app files +#================================================= +# SET PERMISSIONS +#================================================= + chmod -R o-rwx $install_dir chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads chown -R $app:www-data $install_dir diff --git a/scripts/restore b/scripts/restore index 8a6cbfc..a2ea5e3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,8 +18,9 @@ ynh_restore_file --origin_path="$install_dir" # Restore permissions on app files chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads chown -R $app:www-data $install_dir -chmod 600 $install_dir/.env +chmod 640 $install_dir/.env #================================================= # RESTORE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 0d5d5d1..d821c52 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,10 +50,6 @@ then ynh_setup_source --dest_dir="$install_dir" --keep=".env public/uploads storage/uploads" fi -chmod -R o-rwx $install_dir -chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads -chown -R $app:www-data $install_dir - #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= @@ -101,6 +97,14 @@ pushd $install_dir php$phpversion artisan view:clear popd +#================================================= +# SET PERMISSIONS +#================================================= + +chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads +chown -R $app:www-data $install_dir + #================================================= # START SYSTEMD SERVICE #================================================= From 5ccdb04204c787b3156e167a36d00ba3d1f71b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:11:15 +0200 Subject: [PATCH 54/71] fix --- manifest.toml | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0759614..b118d77 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08.3~ynh2" +version = "23.08.3~ynh3" maintainers = ["eric_G"] diff --git a/scripts/upgrade b/scripts/upgrade index d821c52..5ca9964 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,7 +56,7 @@ fi ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config From 414c960e6c703c9c55aa9b19b28a9c3c59382acf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 9 Oct 2023 08:11:21 +0000 Subject: [PATCH 55/71] 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 650a3c9..6b59531 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.08.3~ynh2 +**Shipped version:** 23.08.3~ynh3 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 7eb9a3a..faabeb5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.08.3~ynh2 +**Version incluse :** 23.08.3~ynh3 **Démo :** https://demo.bookstackapp.com From e31c8d7550473e42808bb4e99a7c9d08e848a1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:11:47 +0200 Subject: [PATCH 56/71] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 15cd84a..a4209a4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=BookStack Queue Worker +Description=BookStack: documentation/wiki content [Service] User=__APP__ From 19ca5041d47e300bec4e067626e743d352b33b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:59:35 +0100 Subject: [PATCH 57/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index b118d77..3d4cdc7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08.3~ynh3" +version = "23.10~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.08.3.tar.gz" - sha256 = "da665584507020a071d41c6fef5f3996254854e13700059d6e9ca18c3f29211e" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.tar.gz" + sha256 = "793be0bea3fd18b8be397bb5b7dd12bbe1e3f0a91c40de757efae2993118ed2b" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From e3deb2a5d26da27bc29cf123d4ea98357707504e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:22:33 +0100 Subject: [PATCH 58/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3d4cdc7..09e6b36 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.10~ynh1" +version = "23.10.1~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.tar.gz" - sha256 = "793be0bea3fd18b8be397bb5b7dd12bbe1e3f0a91c40de757efae2993118ed2b" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.1.tar.gz" + sha256 = "817663a26a62cd55e9c6d4f2d69ba1427bc2d3de98b69de9b3eba5f710c24cc8" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From f15daf0b368676fd06390bfebf365829edf215ec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Nov 2023 15:22:38 +0000 Subject: [PATCH 59/71] 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 bf0d820..b4a110f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.10~ynh1 +**Shipped version:** 23.10.1~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index ba0bb79..d960d7f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.10~ynh1 +**Version incluse :** 23.10.1~ynh1 **Démo :** https://demo.bookstackapp.com From 8afc383e6e8d6352fcdcae43d1afd3cf5811d776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:10:39 +0100 Subject: [PATCH 60/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 09e6b36..ff192c8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.10.1~ynh1" +version = "23.10.2~ynh1" maintainers = ["eric_G"] From c5554955b2b6355a0aac810aecfd94c05f5ad09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:10:47 +0100 Subject: [PATCH 61/71] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index ff192c8..c4c7338 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.1.tar.gz" - sha256 = "817663a26a62cd55e9c6d4f2d69ba1427bc2d3de98b69de9b3eba5f710c24cc8" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.2.tar.gz" + sha256 = "77720d16b42975d1bfbb013b7211f6574a087ffd0535f34594e7e588574b3f6a" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 61ea63df5bedd14dc6657240c7e951524e2f8f1c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 7 Nov 2023 16:10:52 +0000 Subject: [PATCH 62/71] 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 b4a110f..0427e8e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.10.1~ynh1 +**Shipped version:** 23.10.2~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index d960d7f..6439a5b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.10.1~ynh1 +**Version incluse :** 23.10.2~ynh1 **Démo :** https://demo.bookstackapp.com From ac06c993702e186f69bdc670d6264f65ba283039 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Nov 2023 15:28:31 +0100 Subject: [PATCH 63/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c4c7338..5eeda30 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.10.2~ynh1" +version = "23.10.4~ynh1" maintainers = ["eric_G"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.2.tar.gz" - sha256 = "77720d16b42975d1bfbb013b7211f6574a087ffd0535f34594e7e588574b3f6a" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.4.tar.gz" + sha256 = "0a3cb6ea782c7f47305572bf580d7be7c97c27bd6ae60cb1587197abbc0c18e5" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From fd4b3d56ab03808f2c91e01480f56d56f1e94d7b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 Nov 2023 14:28:37 +0000 Subject: [PATCH 64/71] 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 0427e8e..7b71ad7 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.10.2~ynh1 +**Shipped version:** 23.10.4~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 6439a5b..9cea97c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.10.2~ynh1 +**Version incluse :** 23.10.4~ynh1 **Démo :** https://demo.bookstackapp.com From e88e47d58317259caf073ab7f63c70ab9b97c1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:40:34 +0100 Subject: [PATCH 65/71] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 5eeda30..0d153b7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -21,8 +21,11 @@ code = "https://github.com/BookStackApp/BookStack" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = true + disk = "50M" ram.build = "500M" ram.runtime = "50M" From 814fddb4b2265db7152daa92b465ba1ae9c3022e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:46:25 +0100 Subject: [PATCH 66/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0d153b7..7968a2e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.10.4~ynh1" +version = "23.12.0~ynh1" maintainers = ["eric_G"] @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.10.4.tar.gz" - sha256 = "0a3cb6ea782c7f47305572bf580d7be7c97c27bd6ae60cb1587197abbc0c18e5" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.tar.gz" + sha256 = "fce344f1c9257465826715861ea0e3d5b8648ad39edde7a24ecf3060cf86e0fe" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From d3ad2e495bae8324da120dfce4e19d6af7b38e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:05:42 +0100 Subject: [PATCH 67/71] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7968a2e..c0df125 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.12.0~ynh1" +version = "23.12.1~ynh1" maintainers = ["eric_G"] @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.tar.gz" - sha256 = "fce344f1c9257465826715861ea0e3d5b8648ad39edde7a24ecf3060cf86e0fe" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.1tar.gz" + sha256 = "c77f8fbb0ecc962fdd75a50fc6257808697f016881ebb71feb7c29ed0e3b58aa" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 35404b9182bf85e3da32b3f6b3561b6062468dff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 16 Jan 2024 16:05:48 +0000 Subject: [PATCH 68/71] 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 6036df5..b3ac3a1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.12.0~ynh1 +**Shipped version:** 23.12.1~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 0e27cc2..2a66849 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.12.0~ynh1 +**Version incluse :** 23.12.1~ynh1 **Démo :** https://demo.bookstackapp.com From c29105f0119a9e00ce318a4f0470ec756954f8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:23:17 +0100 Subject: [PATCH 69/71] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c0df125..c8d98ac 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,7 +59,7 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.1tar.gz" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.1.tar.gz" sha256 = "c77f8fbb0ecc962fdd75a50fc6257808697f016881ebb71feb7c29ed0e3b58aa" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From c0aefb32156c3deaf641f3c77350a8fd8f438208 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Fri, 26 Jan 2024 19:31:03 +0100 Subject: [PATCH 70/71] Upgrade to v23.12.2 (#149) * Upgrade to v23.12.2 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b3ac3a1..0aca8fb 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.12.1~ynh1 +**Shipped version:** 23.12.2~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 2a66849..23972b3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.12.1~ynh1 +**Version incluse :** 23.12.2~ynh1 **Démo :** https://demo.bookstackapp.com diff --git a/manifest.toml b/manifest.toml index c8d98ac..7cb0ed6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.12.1~ynh1" +version = "23.12.2~ynh1" maintainers = ["eric_G"] @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.1.tar.gz" - sha256 = "c77f8fbb0ecc962fdd75a50fc6257808697f016881ebb71feb7c29ed0e3b58aa" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.2.tar.gz" + sha256 = "765450659028641019d2ef8519848da2cddbb834edc08488c92fba3988f8b6c0" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_tag" From 2398d9756a1bae704f42cca3aa0d21ace630c97e Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 15 Feb 2024 05:00:54 +0100 Subject: [PATCH 71/71] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7cb0ed6..6f481f0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,7 +62,7 @@ ram.runtime = "50M" url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v23.12.2.tar.gz" sha256 = "765450659028641019d2ef8519848da2cddbb834edc08488c92fba3988f8b6c0" rename = "bookstack.tar.gz" - autoupdate.strategy = "latest_github_tag" + autoupdate.strategy = "latest_github_release" [resources.system_user] @@ -80,4 +80,4 @@ ram.runtime = "50M" [resources.database] type = "mysql" - \ No newline at end of file +