public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-23 23:01:34 +00:00
Code Issues Releases Wiki Activity

Change config overwrites.json path

Browse Source
This commit is contained in:
FreddleSpl0it
2025-05-30 19:59:54 +02:00
parent a6e13daa8c
commit bc11aed753
8 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/Dockerfiles/bootstrap/modules/BootstrapClamd.py
View File

@@ -40,7 +40,7 @@ class BootstrapClamd(BootstrapBase):
) )
extra_vars = { extra_vars = {
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()

2
data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py
View File

@@ -44,7 +44,7 @@ class BootstrapDovecot(BootstrapBase):
"RAND_PASS2": self.rand_pass(), "RAND_PASS2": self.rand_pass(),
"ENV_VARS": dict(os.environ) "ENV_VARS": dict(os.environ)
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
# Escape DBPASS # Escape DBPASS
self.env_vars['DBPASS'] = self.env_vars['DBPASS'].replace('"', r'\"') self.env_vars['DBPASS'] = self.env_vars['DBPASS'].replace('"', r'\"')
# Set custom filters # Set custom filters

2
data/Dockerfiles/bootstrap/modules/BootstrapMysql.py
View File

@@ -37,7 +37,7 @@ class BootstrapMysql(BootstrapBase):
) )
extra_vars = { extra_vars = {
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()

2
data/Dockerfiles/bootstrap/modules/BootstrapNginx.py
View File

@@ -32,7 +32,7 @@ class BootstrapNginx(BootstrapBase):
'TRUSTED_PROXIES': [item.strip() for item in os.getenv("TRUSTED_PROXIES", "").split(",") if item.strip()], 'TRUSTED_PROXIES': [item.strip() for item in os.getenv("TRUSTED_PROXIES", "").split(",") if item.strip()],
'ADDITIONAL_SERVER_NAMES': [item.strip() for item in os.getenv("ADDITIONAL_SERVER_NAMES", "").split(",") if item.strip()], 'ADDITIONAL_SERVER_NAMES': [item.strip() for item in os.getenv("ADDITIONAL_SERVER_NAMES", "").split(",") if item.strip()],
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()

2
data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py
View File

@@ -20,7 +20,7 @@ class BootstrapPhpfpm(BootstrapBase):
) )
extra_vars = { extra_vars = {
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()

5
data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py
View File

@@ -28,7 +28,7 @@ class BootstrapPostfix(BootstrapBase):
"VALID_CERT_DIRS": self.get_valid_cert_dirs(), "VALID_CERT_DIRS": self.get_valid_cert_dirs(),
"EXTRA_CF": extra_config "EXTRA_CF": extra_config
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()
@@ -39,6 +39,9 @@ class BootstrapPostfix(BootstrapBase):
print("Render config") print("Render config")
self.render_config("/service_config") self.render_config("/service_config")
# Create aliases DB
self.run_command(["newaliases"])
# Create SNI Config # Create SNI Config
self.run_command(["postmap", "-F", "hash:/opt/postfix/conf/sni.map"]) self.run_command(["postmap", "-F", "hash:/opt/postfix/conf/sni.map"])

2
data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py
View File

@@ -72,7 +72,7 @@ class BootstrapRspamd(BootstrapBase):
"RSPAMD_V4": rspamd_v4[0], "RSPAMD_V4": rspamd_v4[0],
"RSPAMD_V6": rspamd_v6[0], "RSPAMD_V6": rspamd_v6[0],
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()

2
data/Dockerfiles/bootstrap/modules/BootstrapSogo.py
View File

@@ -39,7 +39,7 @@ class BootstrapSogo(BootstrapBase):
"SQL_DOMAINS": self.get_domains(), "SQL_DOMAINS": self.get_domains(),
"IAM_SETTINGS": self.get_identity_provider_settings() "IAM_SETTINGS": self.get_identity_provider_settings()
} }
self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars) self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
print("Set Timezone") print("Set Timezone")
self.set_timezone() self.set_timezone()