From b6f86b2f4eaba45f94d42898773f00401a8da52f Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 16 Aug 2023 19:28:52 +0200 Subject: [PATCH 1/3] Jinja template for the POST_INSTALL doc --- doc/POST_INSTALL.md | 8 ++++++-- doc/POST_INSTALL_fr.md | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index a961614..bc1abcd 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,8 +1,12 @@ -If you have requested a database, here are information to log into it: +{% if database %} + +Here are information to log into the database: - Type: __DATABASE__ - Database user: __DB_USER__ - Database name: __DB_NAME__ - Password: __DB_PWD__ -The admin documentation below also contain information on how to connect using SFTP to edit the website content. +{% endif %} + +The admin documentation below contains information on how to connect using SFTP to edit the website content. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index bb975e7..32d4bce 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,8 +1,12 @@ -Si vous avez demandé une base de données, voici les informations pour s'y connecter : +{% if database %} + +Voici les informations pour se connecter à la base de donnée: - Type : __DATABASE__ - Utilisateur de la base de données : __DB_USER__ - Nom de la base de données : __DB_NAME__ - Mot de passe : __DB_PWD__ -La documentation ci-dessous contient également les informations pour se connecter en SSH et modifier le contenu du site web. +{% endif %} + +La documentation ci-dessous contient les informations pour se connecter en SSH et modifier le contenu du site web. From 0ba29961e5cda69eb9ef9b46416dde5b8357a14a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 16 Aug 2023 19:33:41 +0200 Subject: [PATCH 2/3] Fix jinja template Co-authored-by: Alexandre Aubin --- doc/POST_INSTALL.md | 2 +- doc/POST_INSTALL_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index bc1abcd..b4496b8 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,4 +1,4 @@ -{% if database %} +{% if database != 'none' %} Here are information to log into the database: diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 32d4bce..de90822 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,4 +1,4 @@ -{% if database %} +{% if database != 'none' %} Voici les informations pour se connecter à la base de donnée: From 18c71da0445c898e467dde19d4e874b248991410 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 31 Aug 2023 17:50:48 +0200 Subject: [PATCH 3/3] Bump yunohost requirement --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 38c9f51..2be35b6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,7 +14,7 @@ license = "GPL-3.0-only" code = "https://github.com/YunoHost-Apps/my_webapp_ynh" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2.4" architectures = "all" multi_instance = true ldap = "not_relevant"