From 6382e3128d33b051dd01ab7a5f6f916a3921ffde Mon Sep 17 00:00:00 2001 From: FreddleSpl0it <75116288+FreddleSpl0it@users.noreply.github.com> Date: Fri, 30 May 2025 20:01:03 +0200 Subject: [PATCH] Remove backslash escape from jinja2 templates --- .../dovecot-dict-sql-sieve_after.conf.j2 | 10 ++++++---- .../dovecot-dict-sql-sieve_before.conf.j2 | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_after.conf.j2 b/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_after.conf.j2 index ed1a99c37..602acbe91 100644 --- a/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_after.conf.j2 +++ b/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_after.conf.j2 @@ -1,19 +1,21 @@ connect = "host=/var/run/mysqld/mysqld.sock dbname={{ DBNAME }} user={{ DBUSER }} password={{ DBPASS }}" map { - pattern = priv/sieve/name/\$script_name + pattern = priv/sieve/name/$script_name table = sieve_after username_field = username value_field = id fields { - script_name = \$script_name + script_name = $script_name } } map { - pattern = priv/sieve/data/\$id + pattern = priv/sieve/data/$id table = sieve_after username_field = username value_field = script_data fields { - id = \$id + id = $id } } + + diff --git a/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_before.conf.j2 b/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_before.conf.j2 index ea20a89c1..b592df82e 100644 --- a/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_before.conf.j2 +++ b/data/conf/dovecot/config_templates/dovecot-dict-sql-sieve_before.conf.j2 @@ -1,19 +1,19 @@ connect = "host=/var/run/mysqld/mysqld.sock dbname={{ DBNAME }} user={{ DBUSER }} password={{ DBPASS }}" map { - pattern = priv/sieve/name/\$script_name + pattern = priv/sieve/name/$script_name table = sieve_before username_field = username value_field = id fields { - script_name = \$script_name + script_name = $script_name } } map { - pattern = priv/sieve/data/\$id + pattern = priv/sieve/data/$id table = sieve_before username_field = username value_field = script_data fields { - id = \$id + id = $id } }