From 13b4f86d298300305d28db3d0a93ba07fc37368f Mon Sep 17 00:00:00 2001 From: FreddleSpl0it <75116288+FreddleSpl0it@users.noreply.github.com> Date: Thu, 22 May 2025 13:42:17 +0200 Subject: [PATCH] Add support for custom_templates folder to override Jinja2 templates --- data/Dockerfiles/bootstrap/modules/BootstrapClamd.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapMysql.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapNginx.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py | 5 ++++- data/Dockerfiles/bootstrap/modules/BootstrapSogo.py | 5 ++++- data/conf/clamav/custom_templates/.gitkeep | 0 data/conf/dovecot/custom_templates/.gitkeep | 0 data/conf/mysql/custom_templates/.gitkeep | 0 data/conf/nginx/custom_templates/.gitkeep | 0 data/conf/phpfpm/custom_templates/.gitkeep | 0 data/conf/postfix/custom_templates/.gitkeep | 0 data/conf/rspamd/custom_templates/.gitkeep | 0 data/conf/sogo/custom_templates/.gitkeep | 0 16 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 data/conf/clamav/custom_templates/.gitkeep create mode 100644 data/conf/dovecot/custom_templates/.gitkeep create mode 100644 data/conf/mysql/custom_templates/.gitkeep create mode 100644 data/conf/nginx/custom_templates/.gitkeep create mode 100644 data/conf/phpfpm/custom_templates/.gitkeep create mode 100644 data/conf/postfix/custom_templates/.gitkeep create mode 100644 data/conf/rspamd/custom_templates/.gitkeep create mode 100644 data/conf/sogo/custom_templates/.gitkeep diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py b/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py index e7f3f1440..c9a797ed3 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py @@ -31,7 +31,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/etc/clamav/config_templates'), + loader=FileSystemLoader([ + '/etc/clamav/custom_templates', + '/etc/clamav/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py b/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py index 2f5485827..81c8165ac 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py @@ -30,7 +30,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/etc/dovecot/config_templates'), + loader=FileSystemLoader([ + '/etc/dovecot/custom_templates', + '/etc/dovecot/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py b/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py index 6118df42a..0b91b2f70 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py @@ -30,7 +30,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/etc/mysql/conf.d/config_templates'), + loader=FileSystemLoader([ + '/etc/mysql/conf.d/custom_templates', + '/etc/mysql/conf.d/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py b/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py index 7e3b62f73..7b9ee4ea5 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py @@ -22,7 +22,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/etc/nginx/conf.d/config_templates'), + loader=FileSystemLoader([ + '/etc/nginx/conf.d/custom_templates', + '/etc/nginx/conf.d/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py b/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py index 41857d941..97c17f735 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py @@ -15,7 +15,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/php-conf/config_templates'), + loader=FileSystemLoader([ + '/php-conf/custom_templates', + '/php-conf/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py b/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py index a962496f1..b85c4eb4e 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py @@ -17,7 +17,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/opt/postfix/conf/config_templates'), + loader=FileSystemLoader([ + '/opt/postfix/conf/custom_templates', + '/opt/postfix/conf/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py b/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py index b6b233772..b5073caa5 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py @@ -60,7 +60,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader('/etc/rspamd/config_templates'), + loader=FileSystemLoader([ + '/etc/rspamd/custom_templates', + '/etc/rspamd/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py b/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py index f30ed251d..77e7f3827 100644 --- a/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py +++ b/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py @@ -27,7 +27,10 @@ class Bootstrap(BootstrapBase): # Setup Jinja2 Environment and load vars self.env = Environment( - loader=FileSystemLoader("/etc/sogo/config_templates"), + loader=FileSystemLoader([ + '/etc/sogo/custom_templates', + '/etc/sogo/config_templates' + ]), keep_trailing_newline=True, lstrip_blocks=True, trim_blocks=True diff --git a/data/conf/clamav/custom_templates/.gitkeep b/data/conf/clamav/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/dovecot/custom_templates/.gitkeep b/data/conf/dovecot/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/mysql/custom_templates/.gitkeep b/data/conf/mysql/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/nginx/custom_templates/.gitkeep b/data/conf/nginx/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/phpfpm/custom_templates/.gitkeep b/data/conf/phpfpm/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/postfix/custom_templates/.gitkeep b/data/conf/postfix/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/rspamd/custom_templates/.gitkeep b/data/conf/rspamd/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/data/conf/sogo/custom_templates/.gitkeep b/data/conf/sogo/custom_templates/.gitkeep new file mode 100644 index 000000000..e69de29bb