feat(common): add host-tree file/template overrides and skip global items when host overrides exist

This commit is contained in:
2026-07-27 21:55:27 +02:00
parent b40d3249fb
commit f39babaf5d
33 changed files with 1148 additions and 43 deletions
+35 -35
View File
@@ -105,17 +105,17 @@ resolved_fallback_nameserver:
insert_root_ssh_keypair: true
root_ssh_keypair:
- name: id-rsa-dehydrated
priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim
priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
#root_ssh_keypair:
# - name: id-rsa-dehydrated
# priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated
# priv_key_dest: /root/.ssh/id_rsa-dehydrated
# pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated.pub
# pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
# - name: id-rsa-opendkim
# priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim
# priv_key_dest: /root/.ssh/id_rsa-opendkim
# pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim.pub
# pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
# ---
@@ -151,30 +151,30 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml
# ---
copy_plain_files:
- name: monitoring_check_cert_for_dovecot.conf
src_path: e.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf
dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
- name: postfix_create_opendkim_key.conf
src_path: e.mx/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: e.mx/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: e.mx/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: e.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_template_files: []
#copy_plain_files:
#
# - name: monitoring_check_cert_for_dovecot.conf
# src_path: e.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf
# dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
#
# - name: postfix_create_opendkim_key.conf
# src_path: e.mx/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: e.mx/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: e.mx/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: e.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
# dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
#
#
#copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2