update..

host_vars/a.mx.oopen.de.yml

@@ -37,14 +37,14 @@ insert_root_ssh_keypair: true
 
 root_ssh_keypair:
   - name: id-rsa-dehydrated
-    priv_key_src: root/.ssh/a.mx-id_rsa-dehydrated
+    priv_key_src: a.mx/root/.ssh/a.mx-id_rsa-dehydrated
     priv_key_dest: /root/.ssh/id_rsa-dehydrated
-    pub_key_src: root/.ssh/a.mx-id_rsa-dehydrated.pub
+    pub_key_src: a.mx/root/.ssh/a.mx-id_rsa-dehydrated.pub
     pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
   - name: id-rsa-opendkim
-    priv_key_src: root/.ssh/a.mx-id_rsa-opendkim
+    priv_key_src: a.mx/root/.ssh/a.mx-id_rsa-opendkim
     priv_key_dest: /root/.ssh/id_rsa-opendkim
-    pub_key_src: root/.ssh/a.mx-id_rsa-opendkim.pub
+    pub_key_src: a.mx/root/.ssh/a.mx-id_rsa-opendkim.pub
     pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
 
 
@@ -111,26 +111,17 @@ copy_plain_files:
     src_path: a.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
     dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
 
+
+copy_plain_files_postfwd_host_specific:
+
   # Postfix Firewall postfwd
   #
-  - name: postfwd.bl-sender
-    src_path: a.mx/etc/postfix/postfwd.bl-sender
-    dest_path: /etc/postfix/postfwd.bl-sender
-
-  - name: postfwd.bl-sender_domain
-    src_path: a.mx/etc/postfix/postfwd.bl-sender_domain
-    dest_path: /etc/postfix/postfwd.bl-sender_domain
-
-  - name: postfwd.bl-user
-    src_path: a.mx/etc/postfix/postfwd.bl-user
-    dest_path: /etc/postfix/postfwd.bl-user
-
   - name: postfwd.wl-user
     src_path: a.mx/etc/postfix/postfwd.wl-user
     dest_path: /etc/postfix/postfwd.wl-user
 
 
-copy_template_files: []
+#copy_template_files: []
 #
 #  - name: mailsystem_install_amavis.conf
 #    src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
@@ -156,7 +147,7 @@ db_in_use: !!str "true"
 postfix_db_type: PostgreSQL
 postfix_db_name: postfix
 postfix_db_user: postfix
-postfix_db_host: localhost
+#postfix_db_host: /run/postgresql
 postfix_db_pass: FKt4z55FxMZp
 
 # install_amavis.conf
@@ -191,7 +182,7 @@ salutation: "O.OPEN\n
 --\n
 O.OPEN           |   Phone:  +49 30 / 290 484 91\n
 Erkelenzdamm 21  |   Fax:    +49 30 / 290 484 99\n
-D-10999 Berlin   |   http://oopen.de"
+D-10999 Berlin   |   http://oopen.de\n"
 
 # install_upgrade_roundcube-webmail.conf
 #
@@ -202,7 +193,7 @@ autoreply_hostname: autoreply.oopen.de
 roundcube_db_type: pgsql
 roundcube_db_name: roundcubemail
 roundcube_db_user: roundcube
-roundcube_db_host: localhost
+#roundcube_db_host: localhost
 roundcube_db_pass: '3Dsz3j5R'
 
 roundcube_product_name: O.OPEN - Webmailer
@@ -216,7 +207,7 @@ autoreply_2_hostname: autoreply.oopen.de
 roundcube_2_db_type: pgsql
 roundcube_2_db_name: roundcubemail2
 roundcube_2_db_user: roundcube
-roundcube_2_db_host: localhost
+#roundcube_2_db_host: localhost
 roundcube_2_db_pass: '3Dsz3j5R'
 
 roundcube_2_product_name: O.OPEN - Webmailer