Skip to content

Commit

Permalink
Cs fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Jan 29, 2019
1 parent e0ad47e commit dfa105c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
skip_list:
- '204'
- '405'
- '601'
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ None
* `postfix_disable_vrfy_command` [default: `false`]: Disable the `SMTP VRFY` command. This stops some techniques used to harvest email addresses
* `postfix_smtpd_tls_cert_file` [default: `/etc/ssl/certs/ssl-cert-snakeoil.pem`]: Path to certificate file
* `postfix_smtpd_tls_key_file` [default: `/etc/ssl/certs/ssl-cert-snakeoil.key`]: Path to key file
* `postfix_main_raw_options` [optional]: Literal YAML block to pass extra config items to add to main.cf
* `postfix_raw_options` [default: `[]`]: List of lines (to pass extra (unsupported) configuration)

## Dependencies

Expand Down Expand Up @@ -162,7 +162,8 @@ A simple example that shows how to add some raw config:
roles:
- postfix
vars:
postfix_main_raw_options: |
postfix_raw_options:
- |
milter_default_action = accept
milter_protocol = 6
smtpd_milters = unix:opendkim/opendkim.sock unix:opendmarc/opendmarc.sock unix:spamass/spamass.sock unix:clamav/clamav-milter.ctl
Expand Down
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ postfix_disable_vrfy_command: false
postfix_message_size_limit: 10240000
postfix_smtpd_tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
postfix_smtpd_tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
postfix_raw_options: []
7 changes: 3 additions & 4 deletions templates/etc/postfix/main.cf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ message_size_limit = {{ postfix_message_size_limit }}
# Disable the SMTP VRFY command. This stops some techniques used to harvest email addresses.
disable_vrfy_command = {{ postfix_disable_vrfy_command | bool | ternary('yes', 'no') }}

{% if postfix_main_raw_options is defined %}
{{ postfix_main_raw_options }}
{% endif %}

{% for raw_option in postfix_raw_options | default([]) %}

This comment has been minimized.

Copy link
@tersmitten

tersmitten Jan 29, 2019

Author Member

I made a minor change to make it consistent with some other roles @GwennG

{{ raw_option }}
{% endfor %}

0 comments on commit dfa105c

Please sign in to comment.