Update madmail install script for latest madmail version

This commit is contained in:
Ana Custura 2026-03-31 10:36:43 +01:00
parent eead2a13a0
commit e0c30040bc
2 changed files with 6 additions and 6 deletions

View file

@ -252,6 +252,7 @@ def step4():
setting_value = getattr(form, s).data setting_value = getattr(form, s).data
set_setting(s, setting_value) set_setting(s, setting_value)
set_setting('first_setup', "false") set_setting('first_setup', "false")
dump_settings("settings.txt")
run_madmail_installer() run_madmail_installer()
db.session.commit() db.session.commit()
return redirect(url_for('setup_complete')) return redirect(url_for('setup_complete'))
@ -262,7 +263,6 @@ def step4():
@app.route('/setup_complete') @app.route('/setup_complete')
def setup_complete(): def setup_complete():
if get_setting("first_setup"): if get_setting("first_setup"):
dump_settings("settings.txt")
return render_template('setup_complete.html', get_setting=get_setting) return render_template('setup_complete.html', get_setting=get_setting)
return redirect(url_for('admin')) return redirect(url_for('admin'))

View file

@ -11,9 +11,9 @@ def run_madmail_installer():
child.expect("Customize every setting") child.expect("Customize every setting")
child.sendline("2") child.sendline("2")
child.expect("Primary domain") child.expect("Primary domain")
child.sendline(butterbox_hostname) child.sendline(f"{butterbox_hostname}.locaL")
child.expect("MX record") child.expect("MX record")
child.sendline(butterbox_hostname) child.sendline(f"{butterbox_hostname}.locaL")
child.expect("Public IP address") child.expect("Public IP address")
child.sendline("127.0.0.1") child.sendline("127.0.0.1")
child.expect("Additional domains") child.expect("Additional domains")
@ -22,10 +22,10 @@ def run_madmail_installer():
child.sendline("") child.sendline("")
child.expect("Configuration directory") child.expect("Configuration directory")
child.sendline("") child.sendline("")
child.expect("TLS certificate path") child.expect("TLS mode")
child.sendline("")
child.expect("TLS private key path")
child.sendline("") child.sendline("")
child.expect("Disable TLS verification for clients")
child.sendline("y")
child.expect("SMTP port") child.expect("SMTP port")
child.sendline("") child.sendline("")
child.expect("Submission port") child.expect("Submission port")