From 455ba9bea8d18386b39d41569f068b4aaa539b75 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 20 Aug 2019 08:55:14 +0200 Subject: [PATCH] Fixed booleans support --- Dockerfile | 2 +- README.md | 2 +- container-files/templates/etc/supervisor/supervisord.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 290cd41..00a4307 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ ENV BIFF=no \ DKIM_CANONICALIZATION=simple \ # To support multiple concurrent public keys per sending domain, the DNS namespace is further subdivided with "selectors". Selectors are arbitrary names below the "_domainkey." namespace. For example, selectors may indicate the names of your server locations (e.g., "mta1", "mta2", and "mta2"), the signing date (e.g., "january2005", "february2005", etc.), or even the individual user. DKIM_SELECTOR=mail \ - # /etc/aliases entries + # /etc/aliases entries @todo: Better examples there ALIASES= ADD ./container-files/relay-setup-entrypoint.sh /usr/local/bin/relay-setup-entrypoint.sh diff --git a/README.md b/README.md index d98b376..e5093a7 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ List of all environment variables that could be used. # To support multiple concurrent public keys per sending domain, the DNS namespace is further subdivided with "selectors". Selectors are arbitrary names below the "_domainkey." namespace. For example, selectors may indicate the names of your server locations (e.g., "mta1", "mta2", and "mta2"), the signing date (e.g., "january2005", "february2005", etc.), or even the individual user. - DKIM_SELECTOR # (example value: mail) -# /etc/aliases entries +# /etc/aliases entries @todo: Better examples there - ALIASES # (example value: ) diff --git a/container-files/templates/etc/supervisor/supervisord.conf.j2 b/container-files/templates/etc/supervisor/supervisord.conf.j2 index 12e7dd0..4dd6add 100644 --- a/container-files/templates/etc/supervisor/supervisord.conf.j2 +++ b/container-files/templates/etc/supervisor/supervisord.conf.j2 @@ -24,7 +24,7 @@ command=rsyslogd -n stdout_events_enabled=true stderr_events_enabled=true -{% if ENABLE_DKIM == 'true' %} +{% if ENABLE_DKIM.lower() == 'yes' or ENABLE_DKIM.lower() == 'true' %} [program:opendkim] command=opendkim -x /etc/opendkim.conf -A -f stdout_events_enabled=true