Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ postfix:
manage_master_config: True
master_config:
enable_submission: False
main_config:
include_domain_in_mydestination: True

enable_service: True

Expand Down
4 changes: 4 additions & 0 deletions postfix/files/main.cf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@
{{ set_parameter('myhostname', grains['fqdn']) }}
{{ set_parameter('alias_maps', 'hash:' ~ postfix.aliases_file) }}
{{ set_parameter('alias_database', 'hash:' ~ postfix.aliases_file) }}
{%- if salt['pillar.get']('postfix:main_config:include_domain_in_mydestination', True) %}
{{ set_parameter('mydestination', [grains['fqdn'], 'localhost', 'localhost.localdomain', grains['domain']]) }}
{%- else %}
{{ set_parameter('mydestination', [grains['fqdn'], 'localhost', 'localhost.localdomain']) }}
{%- endif %}
{{ set_parameter('relayhost', '') }}
{{ set_parameter('mynetworks', ['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128']) }}
{{ set_parameter('mailbox_size_limit', '0') }}
Expand Down