Merge pull request #67 from netmanagers/fix_bin_prefix

Fix xbin_prefix parameter, add managed by Salt headers

postfix/files/main.cf

@@ -25,7 +25,10 @@
 {%- endif %}
 {%- 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
 
 

postfix/files/master.cf

@@ -61,6 +61,9 @@ y
   {%- endif -%}
 {%- 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
 # of the file, see the master(5) manual page (command: "man 5 master" or
@@ -174,7 +177,7 @@ y
 #  ${nexthop} ${user}
 {%- if salt['pillar.get']('postfix:policyd-spf:enabled', False) %}
 policy-spf  unix  -       n       n       -       -       spawn
-  user=nobody argv={{ xbin_prefix }}/bin/policyd-spf
+  user=nobody argv={{ postfix.xbin_prefix }}/bin/policyd-spf
 {%- endif %}
 {%- if master_config.get('enable_dovecot', False) -%}
 {%-   set dovecot = master_config.get('dovecot', {} )%}