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

Compare commits

base: butter:5b418add4d7704f3478d912d19364a84d3f68cd4
Branches Tags
butter:main
..
compare: butter:aed9fe1d33d45aa17c20fdabd3b068f7e52abe43
Branches Tags
butter:main

No commits in common. "5b418add4d7704f3478d912d19364a84d3f68cd4" and "aed9fe1d33d45aa17c20fdabd3b068f7e52abe43" have entirely different histories.
5b418add4d ... aed9fe1d33

2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/routes.py
View file

@ -270,7 +270,6 @@ def step4():
set_setting(s, setting_value) set_setting(s, setting_value)
set_setting('first_setup', "false") set_setting('first_setup', "false")
dump_settings("settings.txt") dump_settings("settings.txt")
if get_setting("enable_deltachat") == "true":
run_madmail_installer() run_madmail_installer()
db.session.commit() db.session.commit()
return redirect(url_for('setup_complete')) return redirect(url_for('setup_complete'))
@ -313,7 +312,6 @@ def admin_settings():
print(form.errors) print(form.errors)
if form.validate_on_submit(): if form.validate_on_submit():
if form.submit.data: if form.submit.data:
deltachat_newly_enabled = False
for s in populate_settings: for s in populate_settings:
new_value = getattr(form, s).data new_value = getattr(form, s).data
if s in bool_settings: if s in bool_settings:
@ -327,10 +325,6 @@ def admin_settings():
non_admin_settings_changed = True non_admin_settings_changed = True
if s in CHANGES_REQUIRING_RESTART: if s in CHANGES_REQUIRING_RESTART:
app.config['SETTINGS_CHANGED'] = True app.config['SETTINGS_CHANGED'] = True
if s == 'enable_deltachat' and new_value == "true":
deltachat_newly_enabled = True
if deltachat_newly_enabled:
run_madmail_installer()
new_logo = form.butterbox_logo.data new_logo = form.butterbox_logo.data
if new_logo.filename: if new_logo.filename:

10
install_madmail.py
View file

@ -9,7 +9,7 @@ def run_madmail_installer():
butterbox_hostname = settings["butterbox_hostname"] butterbox_hostname = settings["butterbox_hostname"]
cmd = f"sudo ../madmail/madmail install" cmd = f"sudo ../madmail/madmail install"
child = pexpect.spawnu(cmd) child = pexpect.spawn(cmd, encoding = "utf-8")#
child.logfile = open("install_log.txt", "w") child.logfile = open("install_log.txt", "w")
child.expect("Customize every setting") child.expect("Customize every setting")
child.sendline("2") child.sendline("2")
@ -27,8 +27,8 @@ def run_madmail_installer():
child.sendline("") child.sendline("")
child.expect("TLS mode") child.expect("TLS mode")
child.sendline("self_signed") child.sendline("self_signed")
child.expect("Disable TLS") ##child.expect("Disable TLS verification for clients")
child.sendline("y") ##child.sendline("n")
child.expect("SMTP port") child.expect("SMTP port")
child.sendline("25") child.sendline("25")
child.expect("Submission port") child.expect("Submission port")
@ -39,7 +39,9 @@ def run_madmail_installer():
child.sendline("143") child.sendline("143")
child.expect("IMAP TLS port") child.expect("IMAP TLS port")
child.sendline("993") child.sendline("993")
child.expect("Enable chatmail") child.expect("Allow insecure")
child.sendline("n")
child.expect("Enable chatmail endpoint for user registration")
child.sendline("y") child.sendline("y")
child.expect("Chatmail HTTP port") child.expect("Chatmail HTTP port")
child.sendline("8081") child.sendline("8081")