fix: move email addresses to var file

group_vars/mail.yaml

@@ -1,3 +1,28 @@
 ---
 checks :
     - { user : nobody, name : mail_queue, cmd : "/usr/lib/nagios/plugins/check_mailq -w 10 -c 20"}
+
+mail_virtual_transport:
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET,kat.maurer@fau.de
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+
+mail_enabled_senders:
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    HISTORY_PURGED_SECRET: HISTORY_PURGED_SECRET
+    noreply@atlantishq.de: noreply@atlantishq.de

roles/mail/files/enabled_senders

@@ -1,10 +0,0 @@
-# Sender adress       the               user          may use :)
-HISTORY_PURGED_SECRET                    HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET                   HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET         HISTORY_PURGED_SECRET
-#joerg@darknet-fashion.de                joerg@darknet-fashion.de
-HISTORY_PURGED_SECRET               HISTORY_PURGED_SECRET
-noreply@atlantishq.de                   noreply@atlantishq.de
-#@darknet-fashion.de                     joerg
-#@darknet-fashion.com                    joerg
-@atlantishq.de                          sheppy

roles/mail/files/virtual

@@ -1,42 +0,0 @@
-# you can also so this: test-second-account@atlantishq.de test@atlantishq.de
-# which will give all incoming mails of test-second-account to test (sorta obvious)
-
-# IMPORTANT >> IT IS _NOT_ NESSESARY TO DO THE FOLLOWING << IMPORTANT
-# user@atlantishq.de user@esports-erlangen.de
-# every user will get emails from both domains
-
-# If a user also wants to _SEND_ mails, he also have to have an
-# entry in the /etc/postfix/enabled-senders
-
-# CHANGES IN THIS FILE MUST BE MAPPED BEFORE RESTART (!)
-# postmap FILENAME
-# CHANGES IN THIS FILE WILL ONLY BE APPLIED ON POSTFIX RESTART, NOT RELOAD (!)
-
-# sheppy
-HISTORY_PURGED_SECRET    HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET        HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET           HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET         HISTORY_PURGED_SECRET
-#HISTORY_PURGED_SECRET   HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET           HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET	    	    HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET	        HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET          HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET  HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET         HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET HISTORY_PURGED_SECRET
-HISTORY_PURGED_SECRET HISTORY_PURGED_SECRET
-
-# gpt
-HISTORY_PURGED_SECRET HISTORY_PURGED_SECRET,kat.maurer@fau.de
-
-# michy
-HISTORY_PURGED_SECRET        HISTORY_PURGED_SECRET
-
-# catchall
-#@atlantishq.de       HISTORY_PURGED_SECRET
-#@esports-erlangen.de HISTORY_PURGED_SECRET
-@darknet-fashion.com        joerg@darknet-fashion.de
-@darknet-fashion.de         joerg@darknet-fashion.de

roles/mail/handlers/main.yml

@@ -5,7 +5,6 @@
   with_items:
     - sender_access
     - enabled_senders
-    - relocated
     - sender_blacklist
     - tls_policy
     - transport

roles/mail/tasks/main.yaml

@@ -12,7 +12,7 @@
     state: present
 
 - name: Deploy Postfix config
-  copy:
+  template:
     src: "{{ item }}"
     dest: "/etc/postfix/{{ item }}"
   with_items:
@@ -20,7 +20,6 @@
     - enabled_senders
     - main.cf
     - master.cf
-    - relocated
     - sender_blacklist
     - tls_policy
     - transport

roles/mail/templates/enabled_senders

@@ -0,0 +1,6 @@
+# Sender adress       the               user          may use :)
+{% for key, value in mail_enabled_senders %}
+{{ key }} {{ value }}
+{% endfor %}
+
+@atlantishq.de sheppy

roles/mail/templates/virtual

@@ -0,0 +1,17 @@
+# you can also so this: test-second-account@atlantishq.de test@atlantishq.de
+# which will give all incoming mails of test-second-account to test (sorta obvious)
+
+# IMPORTANT >> IT IS _NOT_ NESSESARY TO DO THE FOLLOWING << IMPORTANT
+# user@atlantishq.de user@esports-erlangen.de
+# every user will get emails from both domains
+
+# If a user also wants to _SEND_ mails, he also have to have an
+# entry in the /etc/postfix/enabled-senders
+
+# CHANGES IN THIS FILE MUST BE MAPPED BEFORE RESTART (!)
+# postmap FILENAME
+# CHANGES IN THIS FILE WILL ONLY BE APPLIED ON POSTFIX RESTART, NOT RELOAD (!)
+
+{% for ingress_mail, target in mail_virtual_transport.items() %}
+{{ ingress_mail }} {{ target }}
+{% endfor %}