saltstack-formulas
/
postfix-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(config): add `default_database_type` as default value

This commit is contained in:
Javier Bértoli 2022-01-24 15:09:21 -03:00
parent 3bd3d1c74e
commit 6da70d21bb
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
postfix/config.sls
View File

@ -1,5 +1,4 @@
{% from "postfix/map.jinja" import postfix with context %} {% from "postfix/map.jinja" import postfix with context %}
{%- set default_database_type = postfix.get('config', {}).get('default_database_type', 'hash')%}
include: include:
- postfix - postfix
@ -119,7 +118,7 @@ postfix-config-file-managed-{{ domain }}-ssl-key:
{%- elif ':' in file_path %} {%- elif ':' in file_path %}
{%- set file_type, file_path = file_path.split(':') %} {%- set file_type, file_path = file_path.split(':') %}
{%- else %} {%- else %}
{%- set file_type = default_database_type %} {%- set file_type = postfix.default_database_type %}
{%- endif %} {%- endif %}
{%- if not file_path.startswith('/') %} {%- if not file_path.startswith('/') %}
{%- set file_path = postfix.config_path ~ '/' ~ file_path %} {%- set file_path = postfix.config_path ~ '/' ~ file_path %}

1
postfix/defaults.yaml
View File

@ -13,3 +13,4 @@ postfix:
service: postfix service: postfix
xbin_prefix: /usr xbin_prefix: /usr
dovecot_deliver: /usr/lib/dovecot/deliver dovecot_deliver: /usr/lib/dovecot/deliver
default_database_type: hash

4
postfix/files/main.cf
View File

@ -118,8 +118,6 @@ policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }}
{{ set_parameter('smtpd_recipient_restrictions', recipient_restrictions) }} {{ set_parameter('smtpd_recipient_restrictions', recipient_restrictions) }}
{# From init.sls #} {# From init.sls #}
{%- set default_database_type = salt['pillar.get']('postfix:config:default_database_type', 'hash') %}
{%- for mapping, data in salt['pillar.get']('postfix:mapping', {}).items() %} {%- for mapping, data in salt['pillar.get']('postfix:mapping', {}).items() %}
{%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %} {%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %}
{%- if file_path.startswith('proxy:') %} {%- if file_path.startswith('proxy:') %}
@ -128,7 +126,7 @@ policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }}
{%- elif ':' in file_path %} {%- elif ':' in file_path %}
{%- set file_type, file_path = file_path.split(':') %} {%- set file_type, file_path = file_path.split(':') %}
{%- else %} {%- else %}
{%- set file_type = default_database_type %} {%- set file_type = postfix.default_database_type %}
{%- endif %} {%- endif %}
{%- if not file_path.startswith('/') %} {%- if not file_path.startswith('/') %}
{%- set file_path = postfix.config_path ~ '/' ~ file_path %} {%- set file_path = postfix.config_path ~ '/' ~ file_path %}

5
postfix/init.sls
View File

@ -44,9 +44,6 @@ postfix-init-service-running-postfix-restart:
- pkg: postfix-init-pkg-installed-postfix - pkg: postfix-init-pkg-installed-postfix
{%- endif %} {%- endif %}
{# Used for newaliases, postalias and postconf #}
{%- set default_database_type = salt['pillar.get']('postfix:config:default_database_type', 'hash') %}
# manage /etc/aliases if data found in pillar # manage /etc/aliases if data found in pillar
{% if 'aliases' in pillar.get('postfix', '') %} {% if 'aliases' in pillar.get('postfix', '') %}
{% if salt['pillar.get']('postfix:aliases:use_file', true) == true %} {% if salt['pillar.get']('postfix:aliases:use_file', true) == true %}
@ -55,7 +52,7 @@ postfix-init-service-running-postfix-restart:
{%- if ':' in file_path %} {%- if ':' in file_path %}
{%- set file_type, file_path = postfix.aliases_file.split(':') %} {%- set file_type, file_path = postfix.aliases_file.split(':') %}
{%- else %} {%- else %}
{%- set file_type = default_database_type %} {%- set file_type = postfix.default_database_type %}
{%- endif %} {%- endif %}
{%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %} {%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %}
{%- set need_newaliases = True %} {%- set need_newaliases = True %}