diff --git a/postfix/files/main.cf b/postfix/files/main.cf index b8e0367..1b701d6 100644 --- a/postfix/files/main.cf +++ b/postfix/files/main.cf @@ -120,7 +120,10 @@ policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }} {%- for mapping, data in salt['pillar.get']('postfix:mapping', {}).items() %} {%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %} - {%- if ':' in file_path %} + {%- if file_path.startswith('proxy:') %} + {#- Discard the proxy:-prefix #} + {%- set _, file_type, file_path = file_path.split(':') %} + {%- elif ':' in file_path %} {%- set file_type, file_path = file_path.split(':') %} {%- else %} {%- set file_type = default_database_type %} diff --git a/postfix/init.sls b/postfix/init.sls index e884370..cbed87d 100644 --- a/postfix/init.sls +++ b/postfix/init.sls @@ -76,7 +76,10 @@ postfix_alias_absent_{{ user }}: {% for mapping, data in salt['pillar.get']('postfix:mapping', {}).items() %} {%- set need_postmap = False %} {%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %} - {%- if ':' in file_path %} + {%- if file_path.startswith('proxy:') %} + {#- Discard the proxy:-prefix #} + {%- set _, file_type, file_path = file_path.split(':') %} + {%- elif ':' in file_path %} {%- set file_type, file_path = file_path.split(':') %} {%- else %} {%- set file_type = default_database_type %}