From 33d6f7c7c975c58e75ccc4ed8f75f2335371ddfb Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 00:58:49 +0100 Subject: [PATCH 01/15] Create DISCLAIMER.md paheko needs a root __PATH__ to send correctly mails --- doc/DISCLAIMER.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/DISCLAIMER.md diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..17a6a35 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,8 @@ +## Prerequisite + +You should not install PAHEKO on your main YunoHost domain, especially for sending mails. +* Add a new domain for PAHEKO in YunoHost. + * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. + * Just click on `I already have a domain`. + * Type e.g. `paheko.domain.nohost.me` and click on `Add`. +* Add a Let's Encrypt certificate for this domain. From 9e165219e25eb05069d48ecba14080347daca287 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Dec 2023 23:58:52 +0000 Subject: [PATCH 02/15] Auto-update README --- README.md | 11 +++++++++++ README_fr.md | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/README.md b/README.md index 17f278a..326521a 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,17 @@ Paheko (a word from the Māori language meaning "to cooperate", illustrating the ![Screenshot of Paheko](./doc/screenshots/screenshot.png) +## Disclaimers / important information + +## Prerequisite + +You should not install PAHEKO on your main YunoHost domain, especially for sending mails. +* Add a new domain for PAHEKO in YunoHost. + * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. + * Just click on `I already have a domain`. + * Type e.g. `paheko.domain.nohost.me` and click on `Add`. +* Add a Let's Encrypt certificate for this domain. + ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 7ddda3b..d024551 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,6 +27,17 @@ Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but ![Capture d’écran de Paheko](./doc/screenshots/screenshot.png) +## Avertissements / informations importantes + +## Prerequisite + +You should not install PAHEKO on your main YunoHost domain, especially for sending mails. +* Add a new domain for PAHEKO in YunoHost. + * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. + * Just click on `I already have a domain`. + * Type e.g. `paheko.domain.nohost.me` and click on `Add`. +* Add a Let's Encrypt certificate for this domain. + ## Documentations et ressources * Site officiel de l’app : From 691de2732c3baaa367da21da542f9901cccbbe72 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 01:01:56 +0100 Subject: [PATCH 03/15] Create DICLAIMER_fr.md paheko needs root __PATH__ to send correctly emails --- doc/DICLAIMER_fr.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/DICLAIMER_fr.md diff --git a/doc/DICLAIMER_fr.md b/doc/DICLAIMER_fr.md new file mode 100644 index 0000000..1e57594 --- /dev/null +++ b/doc/DICLAIMER_fr.md @@ -0,0 +1,8 @@ +## Prérequis + +Vous ne devez pas installer PAHEKO sur votre domaine YunoHost principal, surtout pour pouvoir envoyer correctement de emails. +* Ajouter un nouveau domaine pour PAHEKO dans YunoHost + * Si votre domaine YunoHost principal a été fourni par YunoHost, par exemple `domain.nohost.me`, alors vous n'avez pas à acheter/enregistrer un nouveau nom de domaine. + * Cliquez simplement sur `J'ai déjà un nom de domaine`. + * Tapez par exemple `paheko.domain.nohost.me` et cliquez sur `Ajouter`. +* Ajoutez un certificat Let's Encrypt pour ce domaine. From 18dcf3d909910eeda39fb9630a36eb2c69bf1459 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 01:02:30 +0100 Subject: [PATCH 04/15] Update DISCLAIMER.md syntax --- doc/DISCLAIMER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 17a6a35..818cdf1 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,6 +1,6 @@ ## Prerequisite -You should not install PAHEKO on your main YunoHost domain, especially for sending mails. +You should not install PAHEKO on your main YunoHost domain, especially for sending emails. * Add a new domain for PAHEKO in YunoHost. * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. * Just click on `I already have a domain`. From 35b368fb97748d3d8756650c914b2f2118b2894b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Dec 2023 00:02:35 +0000 Subject: [PATCH 05/15] 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 326521a..cd5a9fa 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Paheko (a word from the Māori language meaning "to cooperate", illustrating the ## Prerequisite -You should not install PAHEKO on your main YunoHost domain, especially for sending mails. +You should not install PAHEKO on your main YunoHost domain, especially for sending emails. * Add a new domain for PAHEKO in YunoHost. * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. * Just click on `I already have a domain`. diff --git a/README_fr.md b/README_fr.md index d024551..1d05b43 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but ## Prerequisite -You should not install PAHEKO on your main YunoHost domain, especially for sending mails. +You should not install PAHEKO on your main YunoHost domain, especially for sending emails. * Add a new domain for PAHEKO in YunoHost. * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. * Just click on `I already have a domain`. From 9c2c3c4b41133e2ce8f9c3bb3ee776c7bd723e98 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 01:03:34 +0100 Subject: [PATCH 06/15] Update DICLAIMER_fr.md nope --- doc/DICLAIMER_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DICLAIMER_fr.md b/doc/DICLAIMER_fr.md index 1e57594..3881058 100644 --- a/doc/DICLAIMER_fr.md +++ b/doc/DICLAIMER_fr.md @@ -1,7 +1,7 @@ ## Prérequis Vous ne devez pas installer PAHEKO sur votre domaine YunoHost principal, surtout pour pouvoir envoyer correctement de emails. -* Ajouter un nouveau domaine pour PAHEKO dans YunoHost +* Ajouter un nouveau domaine pour PAHEKO dans YunoHost. * Si votre domaine YunoHost principal a été fourni par YunoHost, par exemple `domain.nohost.me`, alors vous n'avez pas à acheter/enregistrer un nouveau nom de domaine. * Cliquez simplement sur `J'ai déjà un nom de domaine`. * Tapez par exemple `paheko.domain.nohost.me` et cliquez sur `Ajouter`. From 7dd15034f11415735c46f8a7b2fcf18093500a69 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 01:05:06 +0100 Subject: [PATCH 07/15] Update manifest.toml paheko needs a root __PATH__ to send correctly emails --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c4dcec8..1fe65e5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -32,7 +32,7 @@ ram.runtime = "50M" [install.path] type = "path" - default = "/paheko" + default = "/" [install.init_main_permission] type = "group" From 8d6c9f07f3830c087e146fad4b35d884e6a2fad4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 01:19:37 +0100 Subject: [PATCH 08/15] Rename DISCLAIMER.md to PRE_INSTALL.md --- doc/{DISCLAIMER.md => PRE_INSTALL.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{DISCLAIMER.md => PRE_INSTALL.md} (100%) diff --git a/doc/DISCLAIMER.md b/doc/PRE_INSTALL.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/PRE_INSTALL.md From feee2c67f963b5b7bc1d1b31f471e5f6041c8e1d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Dec 2023 00:19:40 +0000 Subject: [PATCH 09/15] Auto-update README --- README.md | 11 ----------- README_fr.md | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/README.md b/README.md index cd5a9fa..17f278a 100644 --- a/README.md +++ b/README.md @@ -27,17 +27,6 @@ Paheko (a word from the Māori language meaning "to cooperate", illustrating the ![Screenshot of Paheko](./doc/screenshots/screenshot.png) -## Disclaimers / important information - -## Prerequisite - -You should not install PAHEKO on your main YunoHost domain, especially for sending emails. -* Add a new domain for PAHEKO in YunoHost. - * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. - * Just click on `I already have a domain`. - * Type e.g. `paheko.domain.nohost.me` and click on `Add`. -* Add a Let's Encrypt certificate for this domain. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index 1d05b43..7ddda3b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,17 +27,6 @@ Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but ![Capture d’écran de Paheko](./doc/screenshots/screenshot.png) -## Avertissements / informations importantes - -## Prerequisite - -You should not install PAHEKO on your main YunoHost domain, especially for sending emails. -* Add a new domain for PAHEKO in YunoHost. - * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. - * Just click on `I already have a domain`. - * Type e.g. `paheko.domain.nohost.me` and click on `Add`. -* Add a Let's Encrypt certificate for this domain. - ## Documentations et ressources * Site officiel de l’app : From 664416c14d41af9d146d41b8fcd9a4368095dbc0 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 01:20:16 +0100 Subject: [PATCH 10/15] Rename DICLAIMER_fr.md to PRE_INSTALL_fr.md --- doc/{DICLAIMER_fr.md => PRE_INSTALL_fr.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{DICLAIMER_fr.md => PRE_INSTALL_fr.md} (100%) diff --git a/doc/DICLAIMER_fr.md b/doc/PRE_INSTALL_fr.md similarity index 100% rename from doc/DICLAIMER_fr.md rename to doc/PRE_INSTALL_fr.md From 6b2d6bc808d957925da0c39b10ebe6e6443e34c2 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 02:02:57 +0100 Subject: [PATCH 11/15] Update ADMIN.md advertisement for full dedicated domain --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 5dd1161..e2ea899 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,3 +1,3 @@ If you wish, you can add custom configurations inside `__INSTALL_DIR__/config.local.php`. -For more than one instance, each will need a dedicated domain name for mail configuration, for example: domain.tld/paheko, paheko.domain.tld, paheko2.domain.tld +**Important**: for some reason, email does not work when installing on a subpath. You are encouraged to use a full, dedicated for this domain (with path set to /) From 56f148e48b68aaf827091c4cf1ba12f4173c8635 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 5 Dec 2023 02:04:10 +0100 Subject: [PATCH 12/15] Update ADMIN_fr.md advertisement for dedicated domain --- doc/ADMIN_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 2dd06fa..104f67e 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,5 +1,5 @@ Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.php`. -Pour plus d'une instance, chacune aura besoin d'un nom de domaine dédié pour la configuration des mails, exemple: domain.tld/paheko, paheko.domain.tld, paheko2.domain.tld +**Important** : Pour une raison quelconque, le courriel ne fonctionne pas lors de l’installation sur une sous-instance. Nous vous encourageons à utiliser un nom de domaine complet dédié à ce domaine (avec le chemin défini sur /). From 9342ab55f54be284f4633885bc59a8a957e0f476 Mon Sep 17 00:00:00 2001 From: rodinux Date: Tue, 5 Dec 2023 02:11:16 +0100 Subject: [PATCH 13/15] remove install.path in manifest.toml and PRE_INSTALL.md advertisement --- doc/PRE_INSTALL.md | 8 -------- doc/PRE_INSTALL_fr.md | 8 -------- manifest.toml | 6 +----- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 doc/PRE_INSTALL.md delete mode 100644 doc/PRE_INSTALL_fr.md diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md deleted file mode 100644 index 818cdf1..0000000 --- a/doc/PRE_INSTALL.md +++ /dev/null @@ -1,8 +0,0 @@ -## Prerequisite - -You should not install PAHEKO on your main YunoHost domain, especially for sending emails. -* Add a new domain for PAHEKO in YunoHost. - * If your main YunoHost domain was provided by YunoHost, e.g. `domain.nohost.me`, then you don't have to buy/register a new domain name. - * Just click on `I already have a domain`. - * Type e.g. `paheko.domain.nohost.me` and click on `Add`. -* Add a Let's Encrypt certificate for this domain. diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md deleted file mode 100644 index 3881058..0000000 --- a/doc/PRE_INSTALL_fr.md +++ /dev/null @@ -1,8 +0,0 @@ -## Prérequis - -Vous ne devez pas installer PAHEKO sur votre domaine YunoHost principal, surtout pour pouvoir envoyer correctement de emails. -* Ajouter un nouveau domaine pour PAHEKO dans YunoHost. - * Si votre domaine YunoHost principal a été fourni par YunoHost, par exemple `domain.nohost.me`, alors vous n'avez pas à acheter/enregistrer un nouveau nom de domaine. - * Cliquez simplement sur `J'ai déjà un nom de domaine`. - * Tapez par exemple `paheko.domain.nohost.me` et cliquez sur `Ajouter`. -* Ajoutez un certificat Let's Encrypt pour ce domaine. diff --git a/manifest.toml b/manifest.toml index 1fe65e5..d44e3e9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,10 +30,6 @@ ram.runtime = "50M" [install.domain] type = "domain" - [install.path] - type = "path" - default = "/" - [install.init_main_permission] type = "group" default = "visitors" @@ -45,7 +41,7 @@ ram.runtime = "50M" [resources.system_user] allow_email = true - + [resources.install_dir] [resources.data_dir] From f783c16488b9e242bbf9453b4512e4b705650add Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:43:49 +0100 Subject: [PATCH 14/15] Update tests.toml: try to fix test for upgrade from old version, CI seems to be confused about the path thingy --- tests.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.toml b/tests.toml index a76e789..bd1e6b6 100644 --- a/tests.toml +++ b/tests.toml @@ -7,3 +7,4 @@ test_format = 1.0 # ------------------------------- test_upgrade_from.534bb03f927c5301e69bc0339a7441142a75b485.name = "Upgrade from 1.2.8" + test_upgrade_from.534bb03f927c5301e69bc0339a7441142a75b485.args.path = "/paheko" From c263d825e3356275f3003417b0c87cf5f8f4a6bf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Tue, 5 Dec 2023 03:03:36 +0100 Subject: [PATCH 15/15] Update tests.toml: zblerg --- tests.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.toml b/tests.toml index bd1e6b6..dc529ea 100644 --- a/tests.toml +++ b/tests.toml @@ -7,4 +7,5 @@ test_format = 1.0 # ------------------------------- test_upgrade_from.534bb03f927c5301e69bc0339a7441142a75b485.name = "Upgrade from 1.2.8" + test_upgrade_from.534bb03f927c5301e69bc0339a7441142a75b485.args.domain = "domain.tld" test_upgrade_from.534bb03f927c5301e69bc0339a7441142a75b485.args.path = "/paheko"