feat(states): add exim.mailname and exim.aliases states

Author: n-rodriguez

docs/README.rst

@@ -57,6 +57,14 @@ Installs the exim package.
 ^^^^^^^^^^^^^^^
 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.mailname``
+^^^^^^^^^^^^^^^^^
+This state manages the ``/etc/mailname`` value used by Debian hosts.
+
+``exim.aliases``
+^^^^^^^^^^^^^^^^
+This state manages the hosts mail aliases.
+
 ``exim.service``
 ^^^^^^^^^^^^^^^^
 Manages the startup and running state of the exim service.

exim/config/aliases.sls

@@ -0,0 +1,45 @@
+# -*- 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 exim with context %}
+
+{%- set virtual_aliases = salt['pillar.get']('exim:virtual_aliases', {}) %}
+
+{%- for name, targets in salt['pillar.get']('exim:aliases', {}) | dictsort %}
+exim/alias/{{ name }}:
+{%- if not targets %}
+  alias.absent:
+    - name: {{ name }}
+{%- else %}
+  alias.present:
+    - name: {{ name }}
+    - target:
+  {%- if targets is list %}
+    {%- for target in targets %}
+      - {{ target }}
+    {%- endfor %}
+  {%- else %}
+        {{ targets }}
+  {%- endif %}
+{%- endif %}
+{%- endfor %}
+
+{%- if virtual_aliases %}
+exim/virtual-aliases/dir:
+  file.directory:
+    - name: {{ exim.virtual_aliases_dir }}
+{%- endif %}
+
+{%- for domain, aliases in virtual_aliases | dictsort %}
+exim/virtual-aliases/{{ domain }}:
+  file.managed:
+    - name: {{ exim.virtual_aliases_dir }}/{{ domain }}
+    - source: salt://exim/files/virtual_aliases.jinja
+    - template: jinja
+    - context:
+        aliases: {{ aliases|json }}
+        domain: {{ domain }}
+{%- endfor %}

exim/config/init.sls

@@ -3,3 +3,5 @@
 
 include:
   - .file
+  - .mailname
+  - .aliases

exim/config/mailname.sls

@@ -0,0 +1,14 @@
+# -*- 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 exim with context %}
+
+{%- set mailname = salt['pillar.get']('exim:mailname', salt['grains.get']('fqdn')) %}
+
+exim/config/mailname:
+  file.managed:
+    - name: {{ exim.mailname_file }}
+    - contents: {{ mailname }}

exim/osfamilymap.yaml

@@ -16,6 +16,8 @@ Debian:
   service: exim4
   config_dir: /etc/exim4
   config_file: update-exim4.conf.conf
+  mailname_file: /etc/mailname
+  virtual_aliases_dir: /etc/exim4/virtual
   sub_dirs:
     - main
     - acl

pillar.example

@@ -14,6 +14,9 @@ exim:
     relay_domains: ''
     relay_nets: ''
     smarthost: ''
+  mailname: foo.bar.baz
+  aliases:
+    root: [email protected]
   files:
     main:
       '01_exim4-config_listmacrosdefs': |

test/integration/default/controls/config_spec.rb

@@ -8,4 +8,14 @@
     # Custom config
     its('content') { should include "dc_hide_mailname='false'" }
   end
+
+  describe file('/etc/mailname') do
+    # Custom config
+    its('content') { should include 'foo.bar.baz' }
+  end
+
+  describe file('/etc/aliases') do
+    # Custom config
+    its('content') { should include 'root: [email protected]' }
+  end
 end

test/salt/pillar/exim.sls

@@ -5,3 +5,6 @@ exim:
   config:
     configtype: 'satellite'
     hide_mailname: 'false'
+  mailname: foo.bar.baz
+  aliases:
+    root: [email protected]