diff --git a/host_vars/b.mx.oopen.de/b.mx-common.yml b/host_vars/b.mx.oopen.de/b.mx-common.yml index 286fbe0..0af8262 100644 --- a/host_vars/b.mx.oopen.de/b.mx-common.yml +++ b/host_vars/b.mx.oopen.de/b.mx-common.yml @@ -105,14 +105,14 @@ insert_root_ssh_keypair: true root_ssh_keypair: - name: id-rsa-dehydrated - priv_key_src: b.mx/root/.ssh/b.mx-id_rsa-dehydrated + priv_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated - pub_key_src: b.mx/root/.ssh/b.mx-id_rsa-dehydrated.pub + pub_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub - name: id-rsa-opendkim - priv_key_src: b.mx/root/.ssh/b.mx-id_rsa-opendkim + priv_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim - pub_key_src: b.mx/root/.ssh/b.mx-id_rsa-opendkim.pub + pub_key_src: b.mx.oopen.de/root/.ssh/b.mx-id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub @@ -149,38 +149,6 @@ root_ssh_keypair: # vars used by roles/common/tasks/copy_files.yml # --- -copy_plain_files: - - # /root/bin/postfix - # - - name: postfix_create_opendkim_key.conf - src_path: b.mx/root/bin/postfix/conf/create_opendkim_key.conf - dest_path: /root/bin/postfix/conf/create_opendkim_key.conf - - - name: postfix_whitelist_mb_sigs.conf - src_path: b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf - dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf - - -copy_plain_files_postfix_host_specific: - - - name: relay_domains - src_path: b.mx/etc/postfix/relay_domains - dest_path: /etc/postfix/relay_domains - - -copy_plain_files_postfwd_host_specific: - - # Postfix Firewall postfwd - # - - name: postfwd.wl-nets - src_path: b.mx/etc/postfix/postfwd.wl-nets - dest_path: /etc/postfix/postfwd.wl-nets - - - name: postfwd.wl-sender - src_path: b.mx/etc/postfix/postfwd.wl-sender - dest_path: /etc/postfix/postfwd.wl-sender - copy_template_files: [] # diff --git a/host_vars/d.mx.oopen.de/d.mx-common.yml b/host_vars/d.mx.oopen.de/d.mx-common.yml index 251c1a9..bbbc98c 100644 --- a/host_vars/d.mx.oopen.de/d.mx-common.yml +++ b/host_vars/d.mx.oopen.de/d.mx-common.yml @@ -107,14 +107,14 @@ insert_root_ssh_keypair: true root_ssh_keypair: - name: id-rsa-dehydrated - priv_key_src: d.mx/root/.ssh/d.mx-id_rsa-dehydrated + priv_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated - pub_key_src: d.mx/root/.ssh/d.mx-id_rsa-dehydrated.pub + pub_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub - name: id-rsa-opendkim - priv_key_src: d.mx/root/.ssh/d.mx-id_rsa-opendkim + priv_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim - pub_key_src: d.mx/root/.ssh/d.mx-id_rsa-opendkim.pub + pub_key_src: d.mx.oopen.de/root/.ssh/d.mx-id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub @@ -151,27 +151,6 @@ root_ssh_keypair: # vars used by roles/common/tasks/copy_files.yml # --- -copy_plain_files: - - - name: postfix_create_opendkim_key.conf - src_path: d.mx/root/bin/postfix/conf/create_opendkim_key.conf - dest_path: /root/bin/postfix/conf/create_opendkim_key.conf - - - name: postfix_whitelist_mb_sigs.conf - src_path: d.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf - dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf - - - name: install_sympa.conf - src_path: lists.mx.warenform/usr/local/src/sympa/conf/install_sympa.conf - dest_path: /usr/local/src/sympa/conf/install_sympa.conf - - -copy_template_files: [] -# -# - name: mailsystem_install_amavis.conf -# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2 -# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf - # --- # vars used by roles/common/tasks/config_files_mailsystem_scripts.yml