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

Merge pull request #67 from netmanagers/fix_bin_prefix 

Fix xbin_prefix parameter, add managed by Salt headers
This commit is contained in:
Niels Abspoel 2018-03-18 20:11:38 +01:00 committed by GitHub
parent 9399043497 47ffa7d173
commit 62abea758a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
postfix/files/main.cf
View File

@ -25,7 +25,10 @@
{%- endif %} {%- endif %}
{%- endmacro -%} {%- endmacro -%}
# Managed by config management #
# This file is managed by salt.
# Modify the salt pillar in the postfix formula that generates this file instead.
#
# See /usr/share/postfix/main.cf.dist for a commented, more complete version # See /usr/share/postfix/main.cf.dist for a commented, more complete version

5
postfix/files/master.cf
View File

@ -61,6 +61,9 @@ y
{%- endif -%} {%- endif -%}
{%- endmacro -%} {%- endmacro -%}
#
# This file is managed by salt.
# Modify the salt pillar in the postfix formula that generates this file instead.
# #
# Postfix master process configuration file. For details on the format # Postfix master process configuration file. For details on the format
# of the file, see the master(5) manual page (command: "man 5 master" or # of the file, see the master(5) manual page (command: "man 5 master" or
@ -174,7 +177,7 @@ y
# ${nexthop} ${user} # ${nexthop} ${user}
{%- if salt['pillar.get']('postfix:policyd-spf:enabled', False) %} {%- if salt['pillar.get']('postfix:policyd-spf:enabled', False) %}
policy-spf unix - n n - - spawn policy-spf unix - n n - - spawn
user=nobody argv={{ xbin_prefix }}/bin/policyd-spf user=nobody argv={{ postfix.xbin_prefix }}/bin/policyd-spf
{%- endif %} {%- endif %}
{%- if master_config.get('enable_dovecot', False) -%} {%- if master_config.get('enable_dovecot', False) -%}
{%- set dovecot = master_config.get('dovecot', {} )%} {%- set dovecot = master_config.get('dovecot', {} )%}