self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2024-12-12 10:45:38 +02:00
Code Issues Releases Activity

Move the cleanup to socrate

Browse Source
This commit is contained in:
Florent Daigniere 2023-08-25 14:38:14 +02:00
parent 1731f45d83
commit 367fd247cb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base/libs/socrate/socrate/system.py
View File

@ -97,6 +97,8 @@ def set_env(required_secrets=[], log_filters=[], log_file=None):
for secret in required_secrets: for secret in required_secrets:
os.environ[f'{secret}_KEY'] = hmac.new(bytearray(secret_key, 'utf-8'), bytearray(secret, 'utf-8'), 'sha256').hexdigest() os.environ[f'{secret}_KEY'] = hmac.new(bytearray(secret_key, 'utf-8'), bytearray(secret, 'utf-8'), 'sha256').hexdigest()
os.system('find / -xdev -type f -name \*.pid -print -delete')
return { return {
key: _coerce_value(os.environ.get(key, value)) key: _coerce_value(os.environ.get(key, value))
for key, value in os.environ.items() for key, value in os.environ.items()

1
core/dovecot/start.py
View File

@ -33,7 +33,6 @@ for script_file in glob.glob("/conf/*.script"):
# Run Podop, then postfix # Run Podop, then postfix
os.system("chown mail:mail /mail") os.system("chown mail:mail /mail")
os.system("chown -R mail:mail /var/lib/dovecot /conf") os.system("chown -R mail:mail /var/lib/dovecot /conf")
os.system("rm -rf /run/dovecot/master.pid")
multiprocessing.Process(target=start_podop).start() multiprocessing.Process(target=start_podop).start()
os.system("dovecot -c /etc/dovecot/dovecot.conf -F") os.system("dovecot -c /etc/dovecot/dovecot.conf -F")

2
core/postfix/start.py
View File

@ -16,8 +16,6 @@ system.set_env(log_filters=[
r'discarding EHLO keywords\: PIPELINING$', r'discarding EHLO keywords\: PIPELINING$',
], log_file=os.environ.get('POSTFIX_LOG_FILE')) ], log_file=os.environ.get('POSTFIX_LOG_FILE'))
os.system("flock -n /queue/pid/master.pid rm /queue/pid/master.pid")
def start_podop(): def start_podop():
system.drop_privs_to('postfix') system.drop_privs_to('postfix')
os.makedirs('/dev/shm/postfix',mode=0o700, exist_ok=True) os.makedirs('/dev/shm/postfix',mode=0o700, exist_ok=True)