From 6061090ec69de206a4e44c62ea7188ececed1811 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:52:33 +0200 Subject: [PATCH 1/7] Attempt at fixing mail. --- conf/.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/.env b/conf/.env index d6a0ee9..519c661 100644 --- a/conf/.env +++ b/conf/.env @@ -40,9 +40,9 @@ EXECUTIONS_DATA_MAX_AGE=168 EXECUTIONS_DATA_PRUNE_MAX_COUNT=2000 N8N_EMAIL_MODE=smtp -N8N_SMTP_HOST=__MAIN_DOMAIN__ +N8N_SMTP_HOST=127.0.0.1 N8N_SMTP_PORT=25 N8N_SMTP_USER=__APP__ N8N_SMTP_PASS=__MAIL_PWD__ -N8N_SMTP_SENDER=__EMAIL__ -N8N_SMTP_SSL=true +N8N_SMTP_SENDER=__APP__@__MAIN_DOMAIN__ +N8N_SMTP_SSL=false From f0a01a7aaa1cd522ffa2afcd71ca49359b5f2c94 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:31:41 +0200 Subject: [PATCH 2/7] Patch mail system in install. --- scripts/install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index 96e4c3b..07a0176 100755 --- a/scripts/install +++ b/scripts/install @@ -60,6 +60,9 @@ ynh_script_progression --message="Installing $app..." --weight=2 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install n8n@${n8n_version} + ynh_string_replace --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ + --replace_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'), tls: {servername:'${main_domain}'}," \ + --target_file="node_modules/n8n/dist/UserManagement/email/NodeMailer.js" popd chmod -R o-rwx "$install_dir" From 2752ad0932041a50e616702ea81e684c323ffcef Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:32:38 +0200 Subject: [PATCH 3/7] Patch mail in upgrade. --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index f6868af..4b41e97 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,6 +83,9 @@ ynh_script_progression --message="Installing $app..." --weight=2 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install n8n@${n8n_version} + ynh_string_replace --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ + --replace_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'), tls: {servername:'${main_domain}'}," \ + --target_file="node_modules/n8n/dist/UserManagement/email/NodeMailer.js" popd #================================================= From b1f182681bd315a7aaeb755b47f9212a761ad2e4 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:39:41 +0200 Subject: [PATCH 4/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 07a0176..aa2cbaf 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,7 @@ ynh_script_progression --message="Installing $app..." --weight=2 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install n8n@${n8n_version} - ynh_string_replace --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ + ynh_replace_string --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ --replace_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'), tls: {servername:'${main_domain}'}," \ --target_file="node_modules/n8n/dist/UserManagement/email/NodeMailer.js" popd From 97d90f57afd7c47e0ef4578005eae83cc018e5ee Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 21:39:57 +0200 Subject: [PATCH 5/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4b41e97..f1a8e60 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,7 @@ ynh_script_progression --message="Installing $app..." --weight=2 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install n8n@${n8n_version} - ynh_string_replace --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ + ynh_replace_string --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ --replace_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'), tls: {servername:'${main_domain}'}," \ --target_file="node_modules/n8n/dist/UserManagement/email/NodeMailer.js" popd From 90a8f5b48b33ae6a1944c97bbfc32563d0dd0f5b Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 22:27:54 +0200 Subject: [PATCH 6/7] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index aa2cbaf..c90ba66 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,7 @@ ynh_script_progression --message="Installing $app..." --weight=2 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install n8n@${n8n_version} - ynh_replace_string --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ + ynh_replace_string --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'),$" \ --replace_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'), tls: {servername:'${main_domain}'}," \ --target_file="node_modules/n8n/dist/UserManagement/email/NodeMailer.js" popd From 142e6b3794432dc057ece0d956738d6f4158f541 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 15 Oct 2023 22:28:09 +0200 Subject: [PATCH 7/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f1a8e60..de817c7 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,7 @@ ynh_script_progression --message="Installing $app..." --weight=2 pushd $install_dir ynh_use_nodejs ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH $ynh_npm install n8n@${n8n_version} - ynh_replace_string --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure')," \ + ynh_replace_string --match_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'),$" \ --replace_string="secure: config_1.default.getEnv('userManagement.emails.smtp.secure'), tls: {servername:'${main_domain}'}," \ --target_file="node_modules/n8n/dist/UserManagement/email/NodeMailer.js" popd