diff --git a/pillar.example b/pillar.example index cc42a19..d3070f6 100644 --- a/pillar.example +++ b/pillar.example @@ -1,14 +1,14 @@ postfix: smtpd_banner: $myhostname ESMTP $mail_name (Ubuntu) - biff: no + biff: "'no'" - append_dot_mydomain: no + append_dot_mydomain: "'no'" - readme_directory: no + readme_directory: "'no'" smtpd_tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem smtpd_tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key - smtpd_use_tls: yes + smtpd_use_tls: "'yes'" smtpd_tls_session_cache_database: btree:${data_directory}/smtpd_scache smtp_tls_session_cache_database: btree:${data_directory}/smtp_scache diff --git a/postfix/config.sls b/postfix/config.sls index 8e633ca..7b3287a 100644 --- a/postfix/config.sls +++ b/postfix/config.sls @@ -22,15 +22,15 @@ include: - template: jinja - defaults: smtpd_banner: {{ salt['pillar.get']('postfix:smtpd_banner', '$myhostname ESMTP $mail_name (Ubuntu)' )}} - biff: {{ salt['pillar.get']('postfix:biff', 'no' )}} + biff: {{ salt['pillar.get']('postfix:biff', "'no'" )}} - append_dot_mydomain: {{ salt['pillar.get']('postfix:append_dot_mydomain', 'no' )}} + append_dot_mydomain: {{ salt['pillar.get']('postfix:append_dot_mydomain', "'no'" )}} - readme_directory: {{ salt['pillar.get']('postfix:readme_directory', 'no' )}} + readme_directory: {{ salt['pillar.get']('postfix:readme_directory', "'no'" )}} smtpd_tls_cert_file: {{ salt['pillar.get']('postfix:smtpd_tls_cert_file', '/etc/ssl/certs/ssl-cert-snakeoil.pem' )}} smtpd_tls_key_file: {{ salt['pillar.get']('postfix:smtpd_tls_key_file', '/etc/ssl/private/ssl-cert-snakeoil.key' )}} - smtpd_use_tls: {{ salt['pillar.get']('postfix:smtpd_use_tls', 'yes' )}} + smtpd_use_tls: {{ salt['pillar.get']('postfix:smtpd_use_tls', "'yes'" )}} smtpd_tls_session_cache_database: {{ salt['pillar.get']('postfix:smtpd_tls_session_cache_database', 'btree:${data_directory}/smtpd_scache' )}} smtp_tls_session_cache_database: {{ salt['pillar.get']('postfix:smtp_tls_session_cache_database', 'btree:${data_directory}/smtp_scache' )}}