From e0c30040bc64c3aac3cc9e3b955b4b5db45f5578 Mon Sep 17 00:00:00 2001 From: Ana Custura Date: Tue, 31 Mar 2026 10:36:43 +0100 Subject: [PATCH] Update madmail install script for latest madmail version --- app/routes.py | 2 +- install_madmail.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/routes.py b/app/routes.py index 3bd03bb..097d603 100644 --- a/app/routes.py +++ b/app/routes.py @@ -252,6 +252,7 @@ def step4(): setting_value = getattr(form, s).data set_setting(s, setting_value) set_setting('first_setup', "false") + dump_settings("settings.txt") run_madmail_installer() db.session.commit() return redirect(url_for('setup_complete')) @@ -262,7 +263,6 @@ def step4(): @app.route('/setup_complete') def setup_complete(): if get_setting("first_setup"): - dump_settings("settings.txt") return render_template('setup_complete.html', get_setting=get_setting) return redirect(url_for('admin')) diff --git a/install_madmail.py b/install_madmail.py index f4f9442..d5c8e14 100644 --- a/install_madmail.py +++ b/install_madmail.py @@ -11,9 +11,9 @@ def run_madmail_installer(): child.expect("Customize every setting") child.sendline("2") child.expect("Primary domain") - child.sendline(butterbox_hostname) + child.sendline(f"{butterbox_hostname}.locaL") child.expect("MX record") - child.sendline(butterbox_hostname) + child.sendline(f"{butterbox_hostname}.locaL") child.expect("Public IP address") child.sendline("127.0.0.1") child.expect("Additional domains") @@ -22,10 +22,10 @@ def run_madmail_installer(): child.sendline("") child.expect("Configuration directory") child.sendline("") - child.expect("TLS certificate path") - child.sendline("") - child.expect("TLS private key path") + child.expect("TLS mode") child.sendline("") + child.expect("Disable TLS verification for clients") + child.sendline("y") child.expect("SMTP port") child.sendline("") child.expect("Submission port")