refactor(pillars): extract default values to pillars

exim/config/aliases.sls

@@ -6,13 +6,10 @@
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import exim with context %}
 
-{%- set aliases         = exim.aliases | default({}) %}
-{%- set virtual_aliases = exim.virtual_aliases | default({}) %}
-
 include:
   - {{ sls_package_install }}
 
-{%- for name, targets in aliases | dictsort %}
+{%- for name, targets in exim.aliases | dictsort %}
 exim/alias/{{ name }}:
 {%- if not targets %}
   alias.absent:
@@ -35,13 +32,13 @@ exim/alias/{{ name }}:
 {%- endif %}
 {%- endfor %}
 
-{%- if virtual_aliases %}
+{%- if exim.virtual_aliases %}
 exim/virtual-aliases/dir:
   file.directory:
     - name: {{ exim.virtual_aliases_dir }}
 {%- endif %}
 
-{%- for domain, aliases in virtual_aliases | dictsort %}
+{%- for domain, aliases in exim.virtual_aliases | dictsort %}
 exim/virtual-aliases/{{ domain }}:
   file.managed:
     - name: {{ exim.virtual_aliases_dir }}/{{ domain }}

exim/config/file.sls

@@ -6,40 +6,25 @@
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import exim with context %}
 
-{%- set exim_config       = exim.config | default({}) %}
-{%- set use_split_config  = exim_config.use_split_config | default('true') %}
-{%- set configtype        = exim_config.configtype | default('satellite') %}
-{%- set hide_mailname     = exim_config.hide_mailname | default('true') %}
-{%- set ue4c_keepcomments = exim_config.ue4c_keepcomments | default('true') %}
-{%- set localdelivery     = exim_config.localdelivery | default('mail_spool') %}
-{%- set local_interfaces  = exim_config.local_interfaces | default('') %}
-{%- set minimaldns        = exim_config.minimaldns | default('false') %}
-{%- set other_hostnames   = exim_config.other_hostnames | default('') %}
-{%- set readhost          = exim_config.readhost | default('') %}
-{%- set relay_domains     = exim_config.relay_domains | default('') %}
-{%- set relay_nets        = exim_config.relay_nets | default('') %}
-{%- set smarthost         = exim_config.smarthost | default('') %}
-{%- set cfilemode         = exim_config.cfilemode | default('644') %}
-
 include:
   - {{ sls_package_install }}
 
 {{ exim.config_dir }}/{{ exim.config_file }}:
   file.managed:
     - contents: |
-        dc_eximconfig_configtype='{{ configtype }}'
-        dc_other_hostnames='{{ other_hostnames }}'
-        dc_local_interfaces='{{ local_interfaces }}'
-        dc_relay_domains='{{ relay_domains }}'
-        dc_relay_nets='{{ relay_nets }}'
-        dc_use_split_config='{{ use_split_config }}'
-        dc_hide_mailname='{{ hide_mailname }}'
-        ue4c_keepcomments='{{ ue4c_keepcomments }}'
-        dc_localdelivery='{{ localdelivery }}'
-        dc_minimaldns='{{ minimaldns }}'
-        dc_readhost='{{ readhost }}'
-        dc_smarthost='{{ smarthost }}'
-        CFILEMODE='{{ cfilemode }}'
+        dc_eximconfig_configtype='{{ exim.config.configtype }}'
+        dc_other_hostnames='{{ exim.config.other_hostnames }}'
+        dc_local_interfaces='{{ exim.config.local_interfaces }}'
+        dc_relay_domains='{{ exim.config.relay_domains }}'
+        dc_relay_nets='{{ exim.config.relay_nets }}'
+        dc_use_split_config='{{ exim.config.use_split_config }}'
+        dc_hide_mailname='{{ exim.config.hide_mailname }}'
+        ue4c_keepcomments='{{ exim.config.ue4c_keepcomments }}'
+        dc_localdelivery='{{ exim.config.localdelivery }}'
+        dc_minimaldns='{{ exim.config.minimaldns }}'
+        dc_readhost='{{ exim.config.readhost }}'
+        dc_smarthost='{{ exim.config.smarthost }}'
+        CFILEMODE='{{ exim.config.cfilemode }}'
     - require:
       - sls: {{ sls_package_install }}
 

exim/defaults.yaml

@@ -1,4 +1,30 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-exim: {}
+exim:
+  mailname: null
+  aliases: {}
+  virtual_aliases: {}
+  files: {}
+  config:
+    configtype: 'satellite'
+    other_hostnames: ''
+    local_interfaces: ''
+    relay_domains: ''
+    relay_nets: ''
+    use_split_config: 'true'
+    hide_mailname: 'true'
+    ue4c_keepcomments: 'true'
+    localdelivery: 'mail_spool'
+    minimaldns: 'false'
+    readhost: ''
+    smarthost: ''
+    cfilemode: '644'
+  sub_dirs:
+    - main
+    - acl
+    - router
+    - transport
+    - retry
+    - rewrite
+    - auth

exim/osfamilymap.yaml

@@ -18,11 +18,3 @@ Debian:
   config_file: update-exim4.conf.conf
   mailname_file: /etc/mailname
   virtual_aliases_dir: /etc/exim4/virtual
-  sub_dirs:
-    - main
-    - acl
-    - router
-    - transport
-    - retry
-    - rewrite
-    - auth