refactor(states): split exim metastate in .package/.config/.service

docs/README.rst

@@ -14,8 +14,7 @@ exim-formula
    :scale: 100%
    :target: https://github.com/semantic-release/semantic-release
 
- Formula to install and configure the exim mail server.
-
+Formula to install and configure the exim mail server.
 
 .. contents:: **Table of Contents**
 
@@ -46,12 +45,22 @@ Available states
 .. contents::
    :local:
 
-
 ``exim``
 ^^^^^^^^
-
 Install the ``exim`` package and enable the service.
 
+``exim.package``
+^^^^^^^^^^^^^^^^
+Installs the exim package.
+
+``exim.config``
+^^^^^^^^^^^^^^^
+This state manages the file ``update-exim4.conf.conf`` under ``/etc/exim4`` (template found in "exim/files"). The configuration is populated by values in "exim/map.jinja" based on the package's default values (and RedHat, Debian, Suse and Arch family distribution specific values), which can then be overridden by values of the same name in pillar.
+
+``exim.service``
+^^^^^^^^^^^^^^^^
+Manages the startup and running state of the exim service.
+
 Testing
 -------
 

exim/config/file.sls

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_package_install = tplroot ~ '.package.install' %}
+{%- from tplroot ~ "/map.jinja" import map with context %}
+
+{% set use_split_config  = salt['pillar.get']('exim:config:use_split_config', 'true') %}
+{% set configtype        = salt['pillar.get']('exim:config:configtype', 'satellite') %}
+{% set hide_mailname     = salt['pillar.get']('exim:config:hide_mailname', 'true') %}
+{% set ue4c_keepcomments = salt['pillar.get']('exim:config:ue4c_keepcomments', 'true') %}
+{% set localdelivery     = salt['pillar.get']('exim:config:localdelivery', 'mail_spool') %}
+{% set local_interfaces  = salt['pillar.get']('exim:config:local_interfaces', '') %}
+{% set minimaldns        = salt['pillar.get']('exim:config:minimaldns', 'false') %}
+{% set other_hostnames   = salt['pillar.get']('exim:config:other_hostnames', '') %}
+{% set readhost          = salt['pillar.get']('exim:config:readhost', '') %}
+{% set relay_domains     = salt['pillar.get']('exim:config:relay_domains', '') %}
+{% set relay_nets        = salt['pillar.get']('exim:config:relay_nets', '') %}
+{% set smarthost         = salt['pillar.get']('exim:config:smarthost', '') %}
+{% set cfilemode         = salt['pillar.get']('exim:config:cfilemode', '644') %}
+
+{{ map.config_dir }}/{{ map.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 }}'
+
+{% if salt['pillar.get']('exim:files') %}
+{% for dir in map.sub_dirs %}
+  {% for file in salt['pillar.get']('exim:files:' + dir, {}) %}
+{{ map.config_dir }}/conf.d/{{ dir }}/{{ file }}:
+  file.managed:
+    - contents_pillar: exim:files:{{ dir }}:{{ file }}
+  {% endfor %}
+{% endfor %}
+{% endif %}

exim/config/init.sls

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .file

exim/init.sls

@@ -1,62 +1,7 @@
-# This is the main state file for configuring exim,
-
-{% from "exim/map.jinja" import map with context %}
-
-exim_install_packages:
-  pkg.installed:
-    - pkgs:
-      {% for pkg in map.pkgs %}
-      - {{ pkg }}
-      {% endfor %}  
-
-{% set use_split_config = salt['pillar.get']('exim:config:use_split_config', 'true') %} 
-{% set configtype = salt['pillar.get']('exim:config:configtype', 'satellite') %} 
-{% set hide_mailname = salt['pillar.get']('exim:config:hide_mailname', 'true') %} 
-{% set ue4c_keepcomments = salt['pillar.get']('exim:config:ue4c_keepcomments', 'true') %} 
-{% set localdelivery = salt['pillar.get']('exim:config:localdelivery', 'mail_spool') %} 
-{% set local_interfaces = salt['pillar.get']('exim:config:local_interfaces', '') %} 
-{% set minimaldns = salt['pillar.get']('exim:config:minimaldns', 'false') %} 
-{% set other_hostnames = salt['pillar.get']('exim:config:other_hostnames', '') %} 
-{% set readhost = salt['pillar.get']('exim:config:readhost', '') %} 
-{% set relay_domains = salt['pillar.get']('exim:config:relay_domains', '') %} 
-{% set relay_nets = salt['pillar.get']('exim:config:relay_nets', '') %} 
-{% set smarthost = salt['pillar.get']('exim:config:smarthost', '') %} 
-{% set cfilemode = salt['pillar.get']('exim:config:cfilemode', '644') %} 
-
-{{ map.config_dir }}/{{ map.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 }}'
-    - watch_in:
-      - service: {{ map.service }}
-
-{% if salt['pillar.get']('exim:files') %}
-{% for dir in map.sub_dirs %}
-  {% for file in salt['pillar.get']('exim:files:' + dir, {}) %}
-{{ map.config_dir }}/conf.d/{{ dir }}/{{ file }}:
-  file.managed:
-    - contents_pillar: exim:files:{{ dir }}:{{ file }}
-    - watch_in:
-      - service: {{ map.service }}
-  {% endfor %}
-{% endfor %}
-{% endif %}
-
-
-exim_service:
-  service.running:
-    - name: {{ map.service }}
-
+# -*- coding: utf-8 -*-
+# vim: ft=sls
 
+include:
+  - .package
+  - .config
+  - .service

exim/package/init.sls

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install

exim/package/install.sls

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import map with context %}
+
+exim/package/install:
+  pkg.installed:
+    - pkgs: {{ map.pkgs | json }}

exim/service/init.sls

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .running

exim/service/running.sls

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_config_file = tplroot ~ '.config.file' %}
+{%- from tplroot ~ "/map.jinja" import map with context %}
+
+include:
+  - {{ sls_config_file }}
+
+exim/service/running:
+  service.running:
+    - name: {{ map.service }}
+    - enable: true
+    - require:
+      - sls: {{ sls_config_file }}