roles/postfix/defaults/main.yaml

@@ -6,23 +6,14 @@ postfix_service_name: postfix.service
 postfix_service_state: started
 postfix_service_enabled: true
 
-postfix_aliases:
-  postmaster: root
-  hostmaster: root
-  webmaster: root
-  abuse: root
-  administrator: root
-  admin: root
-
 postfix_etc_path: /etc/postfix
 
 postfix_sasl_passwd_map_path: "{{ postfix_etc_path }}/sasl_passwd"
 postfix_sasl_passwd_map: {}
 
 postfix_compatibility_level: 2
-postfix_aliases_map_path: /etc/aliases
-postfix_alias_maps: "hash:{{ postfix_aliases_map_path }}"
-postfix_alias_database: "hash:{{ postfix_aliases_map_path }}"
+postfix_alias_maps: hash:/etc/aliases
+postfix_alias_database: hash:/etc/aliases
 postfix_myhostname: "{{ ansible_fqdn }}"
 postfix_inet_interfaces: loopback-only
 postfix_smtp_tls_session_cache_database: btree:${data_directory}/smtp_scache

roles/postfix/handlers/main.yaml

@@ -2,9 +2,6 @@
 - name: "postmap sasl_passwd"
   command: "postmap hash:{{ postfix_sasl_passwd_map_path }}"
 
-- name: "postmap aliases"
-  command: "postmap hash:{{ postfix_aliases_map_path }}"
-
 - name: reload postfix
   service:
     name: "{{ postfix_service_name }}"

roles/postfix/tasks/main.yaml

@@ -31,16 +31,6 @@
     - postmap sasl_passwd
     - reload postfix
 
-- name: manage /etc/aliases
-  template:
-    src: aliases.j2
-    dest: "{{ postfix_aliases_map_path }}"
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - postmap aliases
-
 - name: manage postfix service
   service:
     name: "{{ postfix_service_name }}"

roles/postfix/templates/aliases.j2

@@ -1,13 +0,0 @@
-# {{ ansible_managed }}
-
-{% if postfix_aliases is defined and
-      postfix_aliases is mapping and
-      postfix_aliases | length %}
-{% for k, v in postfix_aliases.items() %}
-{% if v is string %}
-{{ k }} {{ v }}
-{% else %}
-{{ k }} {{ v | join(', ') }}
-{% endif %}
-{% endfor %}
-{% endif %}

roles/unattended-upgrades/templates/apticron.conf.j2

@@ -1,6 +1,5 @@
 # {{ ansible_managed }}
 
 {% if unattended_upgrades_apticron_email is defined %}
-EMAIL="{{ unattended_upgrades_apticron_email | default('root') }}"
-SYSTEM="{{ ansible_hostname }}"
+EMAIL="{{ unattended_upgrades_apticron_email }}"
 {% endif %}