From c443ce7c79df598fb63b6eaacd7e470c05c517ca Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 28 Jul 2026 22:47:03 +0200 Subject: [PATCH] fix(yml): update SSH keypair paths for ga-al-relay and ga-st-mail configurations --- .../ga-al-relay-common.yml | 22 +---- .../ga-st-mail.ga.netz/ga-st-mail-common.yml | 82 +++++-------------- 2 files changed, 25 insertions(+), 79 deletions(-) diff --git a/host_vars/ga-al-relay.ga.netz/ga-al-relay-common.yml b/host_vars/ga-al-relay.ga.netz/ga-al-relay-common.yml index aa192ed..2fed804 100644 --- a/host_vars/ga-al-relay.ga.netz/ga-al-relay-common.yml +++ b/host_vars/ga-al-relay.ga.netz/ga-al-relay-common.yml @@ -163,14 +163,14 @@ insert_root_ssh_keypair: true root_ssh_keypair: - name: id-rsa-dehydrated - priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated + priv_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated - pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub + pub_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub - name: id-rsa-opendkim - priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim + priv_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim - pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim.pub + pub_key_src: ga-al-relay.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub @@ -272,20 +272,6 @@ bind9_gateway_allow_recursion: # --- -copy_plain_files_postfix_host_specific: - - - name: relay_domains - src_path: ga-al-relay/etc/postfix/relay_domains - dest_path: /etc/postfix/relay_domains - - -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 # --- diff --git a/host_vars/ga-st-mail.ga.netz/ga-st-mail-common.yml b/host_vars/ga-st-mail.ga.netz/ga-st-mail-common.yml index b75a160..bfe5881 100644 --- a/host_vars/ga-st-mail.ga.netz/ga-st-mail-common.yml +++ b/host_vars/ga-st-mail.ga.netz/ga-st-mail-common.yml @@ -108,14 +108,14 @@ insert_root_ssh_keypair: true root_ssh_keypair: - name: id-rsa-dehydrated - priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated + priv_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated - pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub + pub_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub - name: id-rsa-opendkim - priv_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim + priv_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim - pub_key_src: ga-st-mail/root/.ssh/ga-st-mail-id_rsa-opendkim.pub + pub_key_src: ga-st-mail.ga.netz/root/.ssh/ga-st-mail-id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub default_user: @@ -206,48 +206,6 @@ sudo_users: # vars used by roles/common/tasks/copy_files.yml # --- -copy_plain_files: - - # /root/bin/monitoring - # - - name: monitoring_check_cert_for_dovecot.conf - src_path: ga-st-mail/root/bin/monitoring/conf/check_cert_for_dovecot.conf - dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf - - # /root/bin/postfix - # - - name: postfix_create_opendkim_key.conf - src_path: ga-st-mail/root/bin/postfix/conf/create_opendkim_key.conf - dest_path: /root/bin/postfix/conf/create_opendkim_key.conf - - - name: postfix_postfix_add_mailboxes.conf - src_path: ga-st-mail/root/bin/postfix/conf/postfix_add_mailboxes.conf - dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf - - - name: postfix_sent_userinfo_postfix.conf - src_path: ga-st-mail/root/bin/postfix/conf/sent_userinfo_postfix.conf - dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf - - - name: postfix_whitelist_mb_sigs.conf - src_path: ga-st-mail/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.wl-user - src_path: ga-st-mail/etc/postfix/postfwd.cf - dest_path: /etc/postfix/postfwd.cf - - -# 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 @@ -281,31 +239,33 @@ si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07e # website_name_postfixadmin: adm.gemeinschaft-altenschlirf.de -email_welcome_message: "\n -Hallo,\n +email_welcome_message: | -Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n + Hallo, -IT Team Gemeinschaft Altenschlirf\n + Ihre/Deine neue E-Mail Adresse ist eingerichtet. ---\n -Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0\n -Müser Straße 1 | Fax: +49 6647 / 9606 179\n -D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de\n -" + IT Team Gemeinschaft Altenschlirf + + -- + + Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0 + Müser Straße 1 | Fax: +49 6647 / 9606 179 + D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de # install_update_dovecot.conf # dovecot_from_address: "Administrator E-Mail " dovecot_reply_to: "postmaster@gemeinschaft-altenschlirf.de" webmailer_address: "https://webmail.gemeinschaft-altenschlirf.de" -salutation: "IT Team Gemeinschaft Altenschlirf\n +salutation: | + IT Team Gemeinschaft Altenschlirf ---\n -Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0\n -Müser Straße 1 | Fax: +49 6647 / 9606 179\n -D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de\n -" + -- + + Gemeinschaft Altenschlirf | Phone: +49 6647 / 9606 0 + Müser Straße 1 | Fax: +49 6647 / 9606 179 + D-36358 Herbstein | E-Mail: it@gemeinschaft-altenschlirf.de # install_upgrade_roundcube-webmail.conf #