From c69c8a09dc8ce01be2e57b4b79c92f7a5a227dce Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Wed, 22 May 2024 08:31:41 +0200 Subject: [PATCH 1/5] Upgrade to v24.05.1 (#164) * Upgrade to v24.05.1 https://github.com/BookStackApp/BookStack/releases/tag/v24.05.1 * Auto-update READMEs --- ALL_README.md | 2 +- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.md) +- [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index a8a4c53..2d39d66 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:** 24.05~ynh1 +**Shipped version:** 24.05.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 5158ea9..b665727 100644 --- a/README_es.md +++ b/README_es.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión actual:** 24.05~ynh1 +**Versión actual:** 24.05.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index e882177..82dd83a 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Paketatutako bertsioa:** 24.05~ynh1 +**Paketatutako bertsioa:** 24.05.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 7ec4456..2caeee2 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 :** 24.05~ynh1 +**Version incluse :** 24.05.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index c1f5b6b..277661e 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión proporcionada:** 24.05~ynh1 +**Versión proporcionada:** 24.05.1~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 6aac286..efbedbe 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**分发版本：** 24.05~ynh1 +**分发版本：** 24.05.1~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 987915f..c1ebd18 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 = "24.05~ynh1" +version = "24.05.1~ynh1" maintainers = [] @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v24.05.tar.gz" - sha256 = "12673a0c69ce5cea5ae0b0be568da7a88c8510b9cd9e96e7cdeb4026a355482f" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v24.05.1.tar.gz" + sha256 = "64b484710a2683e75283497a566b4311d2df4d24ae11eccc87620940afe218c6" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_release" From 4b2a15dc2f6b8b53522dca16a8b5bc58dd4575b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:20:50 +0200 Subject: [PATCH 2/5] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ce32056..2a0d205 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 = "24.05.1~ynh1" +version = "24.05.2~ynh1" maintainers = [] @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v24.05.1.tar.gz" - sha256 = "64b484710a2683e75283497a566b4311d2df4d24ae11eccc87620940afe218c6" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v24.05.2.tar.gz" + sha256 = "1144e1b712240eab7d0d83c05bc77fb771e06b2a10bf8d4c9d9a87ca30708518" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_release" From 5067b31713791806b3c0323615f012dbc52f2adc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 10 Jun 2024 11:20:55 +0000 Subject: [PATCH 3/5] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2d39d66..d32fecc 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:** 24.05.1~ynh1 +**Shipped version:** 24.05.2~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index b665727..a797f24 100644 --- a/README_es.md +++ b/README_es.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión actual:** 24.05.1~ynh1 +**Versión actual:** 24.05.2~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 82dd83a..af6b8ef 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Paketatutako bertsioa:** 24.05.1~ynh1 +**Paketatutako bertsioa:** 24.05.2~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 2caeee2..46e7810 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 :** 24.05.1~ynh1 +**Version incluse :** 24.05.2~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 277661e..4294c04 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión proporcionada:** 24.05.1~ynh1 +**Versión proporcionada:** 24.05.2~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index efbedbe..15d8791 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**分发版本：** 24.05.1~ynh1 +**分发版本：** 24.05.2~ynh1 **演示：** From d88b77ab58f573a61cc6ffc504ee77d1bbcc4bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:24:20 +0200 Subject: [PATCH 4/5] cleaning --- conf/{.env.example => .env} | 0 scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename conf/{.env.example => .env} (100%) diff --git a/conf/.env.example b/conf/.env similarity index 100% rename from conf/.env.example rename to conf/.env diff --git a/scripts/install b/scripts/install index 2bdb5b4..5d56d3e 100644 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 app_url_domain="https://$domain${path%/}" -ynh_add_config --template=../conf/.env.example --destination=$install_dir/.env +ynh_add_config --template=.env --destination=$install_dir/.env chmod 640 $install_dir/.env chown $app:$app $install_dir/.env diff --git a/scripts/upgrade b/scripts/upgrade index 5c64503..c2e49b7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,7 +72,7 @@ ynh_install_composer #timezone="$(cat /etc/timezone)" #app_url_domain="https://$domain${path%/}" -#ynh_add_config --template=../conf/.env.example --destination=$install_dir/.env +#ynh_add_config --template=.env --destination=$install_dir/.env #================================================= # FINAL BOOKSTACK INSTALL From 0d1c98f6cc792622beea671d6563acb727c9ae44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:24:39 +0200 Subject: [PATCH 5/5] Update backup --- scripts/backup | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/backup b/scripts/backup index 19dc083..bc34329 100644 --- a/scripts/backup +++ b/scripts/backup @@ -26,16 +26,8 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #=================================================