Linux-Help/formula-postfix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add extra quotes to prevent 'yes' and 'no' from becoming 'True' and 'False'

Browse source
This commit is contained in:
skyler 2014-08-19 19:11:20 -07:00
parent ce1c234023
commit 4237556a6f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pillar.example
View file

@ -1,14 +1,14 @@
postfix: postfix:
smtpd_banner: $myhostname ESMTP $mail_name (Ubuntu) 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_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
smtpd_tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key 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 smtpd_tls_session_cache_database: btree:${data_directory}/smtpd_scache
smtp_tls_session_cache_database: btree:${data_directory}/smtp_scache smtp_tls_session_cache_database: btree:${data_directory}/smtp_scache

8
postfix/config.sls
View file

@ -22,15 +22,15 @@ include:
- template: jinja - template: jinja
- defaults: - defaults:
smtpd_banner: {{ salt['pillar.get']('postfix:smtpd_banner', '$myhostname ESMTP $mail_name (Ubuntu)' )}} 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_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_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' )}} 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' )}} smtp_tls_session_cache_database: {{ salt['pillar.get']('postfix:smtp_tls_session_cache_database', 'btree:${data_directory}/smtp_scache' )}}