butter/butter-portal
7
0
Fork 0
Code Issues 14 Pull requests Projects Releases Packages Wiki Activity Actions

Ensure madmail starts after initial admin setup reboot, its name was changed

Browse source
This commit is contained in:
Ana Custura 2026-03-31 15:20:48 +01:00
parent 1b7b0a5bc8
commit 9754f8fc74
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
change_manager.py
View file

@ -157,7 +157,7 @@ def check_settings(raspap_installed: bool):
if s == "enable_access_point" and raspap_installed: if s == "enable_access_point" and raspap_installed:
needs_restart = change_service_status("enable_access_point", "raspapd") or needs_restart needs_restart = change_service_status("enable_access_point", "raspapd") or needs_restart
if s == "enable_deltachat": if s == "enable_deltachat":
needs_restart = change_service_status("enable_deltachat", "maddy") or needs_restart needs_restart = change_service_status("enable_deltachat", "madmail") or needs_restart
if s == "butterbox_hostname": if s == "butterbox_hostname":
# change in /etc/hostname # change in /etc/hostname
print("Writing new hostname to /etc/hostname") print("Writing new hostname to /etc/hostname")

8
install_madmail.py
View file

@ -13,9 +13,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(f"{butterbox_hostname}.locaL") child.sendline(f"{butterbox_hostname}.local")
child.expect("MX record") child.expect("MX record")
child.sendline(f"{butterbox_hostname}.locaL") child.sendline(f"{butterbox_hostname}.local")
child.expect("Public IP address") child.expect("Public IP address")
child.sendline(app.config['BUTTERBOX_DEFAULT_IP']) child.sendline(app.config['BUTTERBOX_DEFAULT_IP'])
child.expect("Additional domains") child.expect("Additional domains")
@ -39,7 +39,7 @@ def run_madmail_installer():
child.expect("IMAP TLS port") child.expect("IMAP TLS port")
child.sendline("993") child.sendline("993")
child.expect("Allow insecure") child.expect("Allow insecure")
child.sendline("n") child.sendline("y")
child.expect("Enable chatmail endpoint for user registration") child.expect("Enable chatmail endpoint for user registration")
child.sendline("y") child.sendline("y")
child.expect("Chatmail HTTP port") child.expect("Chatmail HTTP port")
@ -68,4 +68,4 @@ def run_madmail_installer():
child.sendline("n") child.sendline("n")
child.expect("Enable logging for the server") child.expect("Enable logging for the server")
child.sendline("y") child.sendline("y")
child.expect(pexpect.EOF) child.expect(pexpect.EOF)