evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix

Browse Source
This commit is contained in:
Spitap
2023-10-15 12:22:57 +02:00
committed by Antoine Nguyen
parent 6771ea0028
commit e7e5dce778
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modoboa_installer/package.py
View File

@@ -2,6 +2,8 @@
import re import re
from os.path import isfile as file_exists
from . import utils from . import utils
@@ -68,7 +70,8 @@ class DEBPackage(Package):
f"{url} {codename} main" f"{url} {codename} main"
) )
target_file = f"/etc/apt/source.list.d/{name}.list" target_file = f"/etc/apt/source.list.d/{name}.list"
utils.exec_cmd(f'echo "{line} | sude tee {target_file}') tee_option = "-a" if file_exists(target_file) else ""
utils.exec_cmd(f'echo "{line}" | sude tee {tee_option} {target_file}')
self.index_updated = False self.index_updated = False
def update(self): def update(self):

1
modoboa_installer/scripts/rspamd.py
View File

@@ -95,6 +95,7 @@ class Rspamd(base.Installer):
"https://rspamd.com/doc/quickstart.html#setting-the-controller-password") "https://rspamd.com/doc/quickstart.html#setting-the-controller-password")
_context["controller_password"] = self.app_config["password"] _context["controller_password"] = self.app_config["password"]
else: else:
controller_password = controller_password.decode().replace("\n", "")
_context["controller_password"] = controller_password _context["controller_password"] = controller_password
_context["greylisting_disabled"] = "" if not self.app_config["greylisting"].lower() == "true" else "#" _context["greylisting_disabled"] = "" if not self.app_config["greylisting"].lower() == "true" else "#"
_context["whitelist_auth_enabled"] = "" if self.app_config["whitelist_auth"].lower() == "true" else "#" _context["whitelist_auth_enabled"] = "" if self.app_config["whitelist_auth"].lower() == "true" else "#"