From 87cfcd5a749797ef6a0029dc647a90326e1cd98d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:07:26 +0100 Subject: [PATCH 01/29] full name for user create `--first-name` and `--last-name` deprecated --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index dba9ce3..a2e4eec 100644 --- a/scripts/install +++ b/scripts/install @@ -86,7 +86,7 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs F Mobilizon Notifications --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From e4c293390bb146c34d4dbc9de56fd6516443a03f Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:10:08 +0100 Subject: [PATCH 02/29] full name for user create `--first-name` and `--last-name` deprecated --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index d2f1f25..16b8e83 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir=$final_path -yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs -F Mobilizon Notifications --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From c50484e4f4ded7084fee4aeca2a9c827e57133e1 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:14:24 +0100 Subject: [PATCH 03/29] fullname for user create `--fist-name` and `--last-name` deprecated --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 60d4cc8..818db75 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ if ynh_version_gt "1.0.0~ynh1" "${previous_version}" ; then ynh_user_password=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=ynh_user_password --value=$ynh_user_password - yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain $domain --password "$ynh_user_password" -q 0 + yunohost user create ${app}_notifs -F Mobilizon Notifications --domain $domain --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email # Manage previous .env file From 642a1b12be4821293f8edd40f2ace752a6432782 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:19:45 +0100 Subject: [PATCH 04/29] syntax --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a2e4eec..9b7be96 100644 --- a/scripts/install +++ b/scripts/install @@ -86,7 +86,7 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -yunohost user create ${app}_notifs F Mobilizon Notifications --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs -F Mobilizon Notifications --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From 0a98be929781db709c2a9217fa7e907683e050d9 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:24:35 +0100 Subject: [PATCH 05/29] syntax --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9b7be96..bdbc194 100644 --- a/scripts/install +++ b/scripts/install @@ -86,7 +86,7 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -yunohost user create ${app}_notifs -F Mobilizon Notifications --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs -F "Mobilizon Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From e6218a3eb2d06b21f4601c11302b85b6b33223a4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:25:39 +0100 Subject: [PATCH 06/29] syntax --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 16b8e83..9faea43 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir=$final_path -yunohost user create ${app}_notifs -F Mobilizon Notifications --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs -F "Mobilizon Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From 5691e55cb3d2804ee8a97679196cc2a710fcc5e3 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 14:27:18 +0100 Subject: [PATCH 07/29] syntax --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 818db75..5ce6bce 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ if ynh_version_gt "1.0.0~ynh1" "${previous_version}" ; then ynh_user_password=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=ynh_user_password --value=$ynh_user_password - yunohost user create ${app}_notifs -F Mobilizon Notifications --domain $domain --password "$ynh_user_password" -q 0 + yunohost user create ${app}_notifs -F "Mobilizon Notifications" --domain $domain --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email # Manage previous .env file From 592a52c67e86f8e6bd49d9b5bac9289c516b7114 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 17:41:26 +0100 Subject: [PATCH 08/29] this fix is for yunohost 11.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 3cca8dd..010d04f 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.1" }, "multi_instance": false, "services": [ From b0b8d439b2fe3c23062924cf15caf00b702fc071 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 19:16:30 +0100 Subject: [PATCH 09/29] update manifest --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 010d04f..4220f38 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "2.1.0.1~ynh4", + "version": "2.1.0.1~ynh5", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 11.1" + "yunohost": ">= 11.0" }, "multi_instance": false, "services": [ From 8bd9a6465ad162695673caad78075569e2c4ed6f Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 17 Nov 2022 20:25:40 +0100 Subject: [PATCH 10/29] Only avalaible and needed since 11.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 4220f38..2cc37fd 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 11.0" + "yunohost": ">= 11.1" }, "multi_instance": false, "services": [ From 20bb66a8c64a3e312e6a325a1c8dfac9dc29e3aa Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 14:18:14 +0100 Subject: [PATCH 11/29] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5ce6bce..6f5e36f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -248,8 +248,8 @@ ynh_script_progression --message="Updating a configuration file..." config="/etc/$app/config.exs" ynh_backup_if_checksum_is_different --file="$config" -ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" -ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" +#ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" +#ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" ynh_store_file_checksum --file="$config" chmod 400 "$config" From 1af7436bf9b9dc22e1d97bee014cff80dd8526a9 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 14:21:39 +0100 Subject: [PATCH 12/29] commit changes mail try debug mail --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6f5e36f..8276cbc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -248,8 +248,8 @@ ynh_script_progression --message="Updating a configuration file..." config="/etc/$app/config.exs" ynh_backup_if_checksum_is_different --file="$config" -#ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" -#ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" +# ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" +# ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" ynh_store_file_checksum --file="$config" chmod 400 "$config" From a0971c5bed1d2a4473d4473bb5861c9517f0e1c4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 14:30:56 +0100 Subject: [PATCH 13/29] try update my changes --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2cc37fd..b98db49 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "2.1.0.1~ynh5", + "version": "2.1.0.1~ynh6", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From 64632121b02191dd2ff0b5416a9d7c9c66bcaa90 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 14:41:25 +0100 Subject: [PATCH 14/29] Try debug mail --- conf/mail.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/mail.exs b/conf/mail.exs index 722cb1a..5043498 100644 --- a/conf/mail.exs +++ b/conf/mail.exs @@ -2,7 +2,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer, adapter: Swoosh.Adapters.SMTP, relay: "127.0.0.1", - #hostname: "127.0.0.1", + hostname: "127.0.0.1", # usually 25, 465 or 587 port: 25, username: "__YNH_USER__", From f64fe97c597cf68af5d71df8893e976d3a9f1fb5 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 14:42:15 +0100 Subject: [PATCH 15/29] try debug mail --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b98db49..a5f37ea 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "2.1.0.1~ynh6", + "version": "2.1.0.1~ynh7", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From 6b022c6e5eea5e89bf4bed3da1fb2422a45239a5 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 17:59:12 +0100 Subject: [PATCH 16/29] try come back to branch --- conf/mail.exs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/mail.exs b/conf/mail.exs index 5043498..c8ef46e 100644 --- a/conf/mail.exs +++ b/conf/mail.exs @@ -2,7 +2,7 @@ config :mobilizon, Mobilizon.Web.Email.Mailer, adapter: Swoosh.Adapters.SMTP, relay: "127.0.0.1", - hostname: "127.0.0.1", + #hostname: "127.0.0.1", # usually 25, 465 or 587 port: 25, username: "__YNH_USER__", @@ -15,4 +15,3 @@ config :mobilizon, Mobilizon.Web.Email.Mailer, no_mx_lookups: false, # can be `:always`. If your smtp relay requires authentication set it to `:always`. auth: :always - From f22f32331824911af0953d5c80286d928ed7ff64 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 18:01:41 +0100 Subject: [PATCH 17/29] Back to stable version --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8276cbc..5ce6bce 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -248,8 +248,8 @@ ynh_script_progression --message="Updating a configuration file..." config="/etc/$app/config.exs" ynh_backup_if_checksum_is_different --file="$config" -# ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" -# ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" +ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" +ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" ynh_store_file_checksum --file="$config" chmod 400 "$config" From 40074a31b212bdbcc3d46acd50c7ffe370ae6d9a Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 19 Nov 2022 18:02:56 +0100 Subject: [PATCH 18/29] back stable vesrsion --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a5f37ea..010d04f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "2.1.0.1~ynh7", + "version": "2.1.0.1~ynh4", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From 71c9e8613bd16a394b35927befaa0f6e433b20f1 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 24 Nov 2022 09:56:17 +0100 Subject: [PATCH 19/29] try fix swoosh smtp --- scripts/upgrade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5ce6bce..899b356 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -231,15 +231,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:$app "$datadir" -#================================================= -# MAKE SETUP -#================================================= -ynh_script_progression --message="Making setup..." - -pushd $final_path/live - ynh_exec_as $app ./bin/mobilizon_ctl migrate -popd - #================================================= # UPDATE A CONFIG FILE #================================================= @@ -252,6 +243,15 @@ ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_strin ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" ynh_store_file_checksum --file="$config" +#================================================= +# MAKE SETUP +#================================================= +ynh_script_progression --message="Making setup..." + +pushd $final_path/live + ynh_exec_as $app ./bin/mobilizon_ctl migrate +popd + chmod 400 "$config" chown $app:$app "$config" From 6dc2e703ba6f923b84f987ace60a7e8fb542b437 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 24 Nov 2022 10:03:27 +0100 Subject: [PATCH 20/29] fix-smtp --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 010d04f..2cc37fd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A decentralized and federated platform to organize events", "fr": "Une plateforme décentralisée et fédérée pour organiser des événements" }, - "version": "2.1.0.1~ynh4", + "version": "2.1.0.1~ynh5", "url": "https://joinmobilizon.org/", "upstream": { "license": "AGPL-3.0-or-later", From f080c021b3a8b668f7e60ba2a6cb442fdd4c4886 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 24 Nov 2022 10:04:14 +0100 Subject: [PATCH 21/29] fix-smtp --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cf5562a..cb50052 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ A decentralized and federated platform to organize events -**Shipped version:** 2.1.0.1~ynh4 +**Shipped version:** 2.1.0.1~ynh5 **Demo:** https://demo.mobilizon.org From 2d2c2e191fd4b5b5fedf3674c3e16e0b14631b72 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Thu, 24 Nov 2022 10:04:42 +0100 Subject: [PATCH 22/29] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 60e272b..53b16f4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ A decentralized and federated platform to organize events -**Version incluse :** 2.1.0.1~ynh4 +**Version incluse :** 2.1.0.1~ynh5 **Démo :** https://demo.mobilizon.org From 69d327149f79aa5743df5eb0c2c449dfa50d0ce6 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 27 Nov 2022 23:51:51 +0100 Subject: [PATCH 23/29] choose Bamboo adapter for mail This version of Mobilizon works with the module Bamboo, not Swoosh --- conf/mail.exs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/mail.exs b/conf/mail.exs index c8ef46e..9cfbe90 100644 --- a/conf/mail.exs +++ b/conf/mail.exs @@ -1,7 +1,9 @@ config :mobilizon, Mobilizon.Web.Email.Mailer, - adapter: Swoosh.Adapters.SMTP, - relay: "127.0.0.1", + #adapter: Swoosh.Adapters.SMTP, + #relay: "127.0.0.1", + adapter: Bamboo.SMTPAdapter, + server: "127.0.0.1", #hostname: "127.0.0.1", # usually 25, 465 or 587 port: 25, From 50937a81aa208ba256113e9457f06d7a584a0aec Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 27 Nov 2022 23:57:35 +0100 Subject: [PATCH 24/29] edit back config with --fistname and --lastname I haved changed it for my instance with yunohost 11.1 to debug, but for this PR I put it back for stable version --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index bdbc194..dba9ce3 100644 --- a/scripts/install +++ b/scripts/install @@ -86,7 +86,7 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app --home_dir="$final_path" -yunohost user create ${app}_notifs -F "Mobilizon Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From 4253d0a896faf98087863cccadc47d8f3ec34db0 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sun, 27 Nov 2022 23:58:59 +0100 Subject: [PATCH 25/29] back config user --firstname and --lastname --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 9faea43..d2f1f25 100644 --- a/scripts/restore +++ b/scripts/restore @@ -55,7 +55,7 @@ ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir=$final_path -yunohost user create ${app}_notifs -F "Mobilizon Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 +yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain "$domain" --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email #================================================= From d5a2a7a2adaf51f8174436aa3533e3b121a6b3b6 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Nov 2022 00:04:56 +0100 Subject: [PATCH 26/29] fix smtp adapter and conf user Fix the conf for user create with --firstname and --lastname for stable branch. change the smtp adapter, this mobilizon version 2.0.2 use Bamboo, not Swoosh adapter needed only when upgrading to 2.1. --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 899b356..7b00dd4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ if ynh_version_gt "1.0.0~ynh1" "${previous_version}" ; then ynh_user_password=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=ynh_user_password --value=$ynh_user_password - yunohost user create ${app}_notifs -F "Mobilizon Notifications" --domain $domain --password "$ynh_user_password" -q 0 + yunohost user create ${app}_notifs -firstname "Mobilizon" --lastname "Notifications" --domain $domain --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email # Manage previous .env file @@ -239,8 +239,8 @@ ynh_script_progression --message="Updating a configuration file..." config="/etc/$app/config.exs" ynh_backup_if_checksum_is_different --file="$config" -ynh_replace_string --match_string="adapter: Bamboo.SMTPAdapter," --replace_string="adapter: Swoosh.Adapters.SMTP," --target_file="$config" -ynh_replace_string --match_string="server: \"127.0.0.1\"," --replace_string="relay: \"127.0.0.1\"," --target_file="$config" +ynh_replace_string --match_string="adapter: Swoosh.Adapters.SMTP," --replace_string="adapter: Bamboo.SMTPAdapter," --target_file="$config" +ynh_replace_string --match_string="relay: \"127.0.0.1\"," --replace_string="server: \"127.0.0.1\"," --target_file="$config" ynh_store_file_checksum --file="$config" #================================================= From fa38c85da9fcd39175e634756d6462c8c8c16913 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Nov 2022 00:21:00 +0100 Subject: [PATCH 27/29] back for stable branch --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2cc37fd..3b43f8e 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 11.1" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ From 7086c9bbe1247abf3c5ea38719209c98916d5ce6 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 28 Nov 2022 00:36:06 +0100 Subject: [PATCH 28/29] clean syntax --- scripts/upgrade | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7b00dd4..9dea720 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -98,7 +98,7 @@ if ynh_version_gt "1.0.0~ynh1" "${previous_version}" ; then ynh_user_password=$(ynh_string_random --length=30) ynh_app_setting_set --app=$app --key=ynh_user_password --value=$ynh_user_password - yunohost user create ${app}_notifs -firstname "Mobilizon" --lastname "Notifications" --domain $domain --password "$ynh_user_password" -q 0 + yunohost user create ${app}_notifs --firstname "Mobilizon" --lastname "Notifications" --domain $domain --password "$ynh_user_password" -q 0 yunohost user update ${app}_notifs --add-mailalias $app@$domain --add-mailforward $admin_email # Manage previous .env file @@ -231,6 +231,15 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:$app "$datadir" +#================================================= +# MAKE SETUP +#================================================= +ynh_script_progression --message="Making setup..." + +pushd $final_path/live + ynh_exec_as $app ./bin/mobilizon_ctl migrate +popd + #================================================= # UPDATE A CONFIG FILE #================================================= @@ -243,15 +252,6 @@ ynh_replace_string --match_string="adapter: Swoosh.Adapters.SMTP," --replace_str ynh_replace_string --match_string="relay: \"127.0.0.1\"," --replace_string="server: \"127.0.0.1\"," --target_file="$config" ynh_store_file_checksum --file="$config" -#================================================= -# MAKE SETUP -#================================================= -ynh_script_progression --message="Making setup..." - -pushd $final_path/live - ynh_exec_as $app ./bin/mobilizon_ctl migrate -popd - chmod 400 "$config" chown $app:$app "$config" From ad7533ebea7d3bf328b534d7821d4a83e3dd7e53 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 Jan 2023 00:15:50 +0000 Subject: [PATCH 29/29] Auto-update README --- README.md | 1 - README_fr.md | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index cb50052..01168ea 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ A decentralized and federated platform to organize events **Shipped version:** 2.1.0.1~ynh5 - **Demo:** https://demo.mobilizon.org ## Screenshots diff --git a/README_fr.md b/README_fr.md index 53b16f4..f5b1ab9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,15 @@ It shall NOT be edited by hand. # Mobilizon pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/mobilizon.svg)](https://dash.yunohost.org/appci/app/mobilizon) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mobilizon.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mobilizon.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/mobilizon.svg)](https://dash.yunohost.org/appci/app/mobilizon) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mobilizon.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mobilizon.maintain.svg) [![Installer Mobilizon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mobilizon) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Mobilizon rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Mobilizon rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble A decentralized and federated platform to organize events @@ -23,14 +23,13 @@ A decentralized and federated platform to organize events -**Version incluse :** 2.1.0.1~ynh5 - +**Version incluse :** 2.1.0.1~ynh5 **Démo :** https://demo.mobilizon.org -## Captures d'écran +## Captures d’écran -![Capture d'écran de Mobilizon](./doc/screenshots/screenshot1.jpg) +![Capture d’écran de Mobilizon](./doc/screenshots/screenshot1.jpg) ## Avertissements / informations importantes @@ -43,9 +42,9 @@ A decentralized and federated platform to organize events ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Dépôt de code officiel de l'app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -61,4 +60,4 @@ ou sudo yunohost app upgrade mobilizon -u https://github.com/YunoHost-Apps/mobilizon_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file