Refactor Ansible tasks and templates for improved consistency and clarity

This commit is contained in:
2026-07-31 02:24:42 +02:00
parent 81ef678904
commit 46327da2ac
52 changed files with 1679 additions and 1461 deletions
+16 -25
View File
@@ -4,12 +4,11 @@
# vars used by roles/network_interfaces
# ---
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True
network_manage_devices: true
# Should the interfaces be reloaded after config change?
network_interface_reload: False
network_interface_reload: false
network_interface_path: /etc/network/interfaces.d
network_interface_required_packages:
@@ -19,7 +18,6 @@ network_interface_required_packages:
- ifupdown
- ifenslave
network_interfaces:
- device: eno1
@@ -48,19 +46,17 @@ network_interfaces:
- 192.168.82.1
search: akb.netz
# ---
# vars used by roles/common/tasks/basic.yml
# ---
set_default_limit_nofile: true
# ---
# roles/common/tasks/default-users.yml
# ---
#extra_user:
# extra_user:
#
# - name: borg
# user_id: 1065
@@ -75,14 +71,12 @@ set_default_limit_nofile: true
# - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMhbQo8gm3zNCkNTSHrLE1np0IDiSUHgfyy8469guHFz root@file-akb'
# - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlm5VPClcXv5O8GaL9H5EVgXaP3/FY7aafB0Jes3BvH root@gw-akb'
# ---
# vars used by roles/common/tasks/systemd-resolved.yml
# ---
systemd_resolved: true
# CyberGhost - Schnelle Verbindung mit Keine-Logs-Datenschutzrichtlinie
# Primäre DNS-Adresse: 38.132.106.139
# Sekundäre DNS-Adresse: 194.187.251.67
@@ -93,8 +87,8 @@ systemd_resolved: true
# IPv6: 2606:4700:4700::1111
# sekundäre DNS-Adresse
# IPv4: 1.0.0.1
# IPv6: 2606:4700:4700::1001
#
# IPv6: 2606:4700:4700::1001
#
# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit
# primäre DNS-Adresse
# IPv4: 8.8.8.8
@@ -105,20 +99,20 @@ systemd_resolved: true
#
# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug
# primäre DNS-Adresse
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# sekundäre DNS-Adresse
# IPv4: 149.112.112.112
# IPv6: 2620:fe::9
#
# OpenNIC - https://www.opennic.org/
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 194.36.144.87 - ns29.de
# IPv6: 2a00:f826:8:2::195 - ns31.de
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
# IPv4: 5.1.66.255
# IPv6: 2001:678:e68:f000::
# Servername für DNS-over-TLS: dot.ffmuc.net
@@ -128,10 +122,10 @@ resolved_nameserver:
# search domains
#
# If there are more than one search domains, then specify them here in the order in which
# If there are more than one search domains, then specify them here in the order in which
# the resolver should also search them
#
#resolved_domains: []
# resolved_domains: []
resolved_domains:
- ~.
- akb.netz
@@ -141,8 +135,7 @@ resolved_dnssec: false
# dns.as250.net: 194.150.168.168
#
resolved_fallback_nameserver:
- 172.16.82.254
- 172.16.82.254
# ---
# vars used by roles/common/tasks/sshd.yml
@@ -154,8 +147,7 @@ sshd_permit_root_login: !!str "yes"
sshd_password_authentication: !!str "yes"
#sshd_use_pam: !!str "no"
# sshd_use_pam: !!str "no"
# ---
# vars used by roles/common/tasks/cron.yml
@@ -191,7 +183,6 @@ cron_user_entries:
hour: "23"
job: /root/bin/admin-stuff/cleanup_from_old_files.sh
cron_user_special_time_entries:
- name: "Restart DNS Cache service 'systemd-resolved'"
+16 -26
View File
@@ -4,12 +4,11 @@
# vars used by roles/network_interfaces
# ---
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True
network_manage_devices: true
# Should the interfaces be reloaded after config change?
network_interface_reload: False
network_interface_reload: false
network_interface_path: /etc/network/interfaces.d
network_interface_required_packages:
@@ -19,7 +18,6 @@ network_interface_required_packages:
- ifupdown
- ifenslave
network_interfaces:
- device: eno1
@@ -48,19 +46,17 @@ network_interfaces:
- 192.168.102.1
search: flr.netz
# ---
# vars used by roles/common/tasks/basic.yml
# ---
set_default_limit_nofile: true
# ---
# vars used by roles/common/tasks/default-users.yml
# ---
#extra_user:
# extra_user:
#
# - name: borg
# user_id: 1065
@@ -75,14 +71,12 @@ set_default_limit_nofile: true
# - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHTvxBfneJxBjMdpO9JCSkDyXQZUFXjYa/rqA6gQ0TL2 root@file-flr'
# - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOSvVJ6MbYdXhIeS6FWFx2M/p7Gb6aG3oy25ZJRctXYd root@gw-flr'
# ---
# vars used by roles/common/tasks/systemd-resolved.yml
# ---
systemd_resolved: true
# CyberGhost - Schnelle Verbindung mit Keine-Logs-Datenschutzrichtlinie
# Primäre DNS-Adresse: 38.132.106.139
# Sekundäre DNS-Adresse: 194.187.251.67
@@ -93,8 +87,8 @@ systemd_resolved: true
# IPv6: 2606:4700:4700::1111
# sekundäre DNS-Adresse
# IPv4: 1.0.0.1
# IPv6: 2606:4700:4700::1001
#
# IPv6: 2606:4700:4700::1001
#
# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit
# primäre DNS-Adresse
# IPv4: 8.8.8.8
@@ -105,20 +99,20 @@ systemd_resolved: true
#
# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug
# primäre DNS-Adresse
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# sekundäre DNS-Adresse
# IPv4: 149.112.112.112
# IPv6: 2620:fe::9
#
# OpenNIC - https://www.opennic.org/
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 194.36.144.87 - ns29.de
# IPv6: 2a00:f826:8:2::195 - ns31.de
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
# IPv4: 5.1.66.255
# IPv6: 2001:678:e68:f000::
# Servername für DNS-over-TLS: dot.ffmuc.net
@@ -128,10 +122,10 @@ resolved_nameserver:
# search domains
#
# If there are more than one search domains, then specify them here in the order in which
# If there are more than one search domains, then specify them here in the order in which
# the resolver should also search them
#
#resolved_domains: []
# resolved_domains: []
resolved_domains:
- flr.netz
@@ -140,8 +134,7 @@ resolved_dnssec: false
# dns.as250.net: 194.150.168.168
#
resolved_fallback_nameserver:
- 172.16.102.254
- 172.16.102.254
# ---
# vars used by roles/common/tasks/sshd.yml
@@ -153,8 +146,7 @@ sshd_permit_root_login: !!str "yes"
sshd_password_authentication: !!str "yes"
#sshd_use_pam: !!str "no"
# sshd_use_pam: !!str "no"
# ---
# vars used by roles/common/tasks/cron.yml
@@ -181,11 +173,9 @@ cron_user_entries:
hour: "7-22"
job: /root/bin/monitoring/check_cups-browsed.sh
cron_user_special_time_entries:
- name: "Restart DNS Cache service 'systemd-resolved'"
special_time: reboot
job: "sleep 10 ; /bin/systemctl restart systemd-resolved"
insertafter: PATH
+15 -26
View File
@@ -4,14 +4,11 @@
# vars used by roles/network_interfaces
# ---
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: False
network_manage_devices: false
# Should the interfaces be reloaded after config change?
network_interface_reload: False
network_interface_reload: false
# ---
# vars used by roles/common/tasks/basic.yml
@@ -19,15 +16,12 @@ network_interface_reload: False
set_default_limit_nofile: true
# ---
# vars used by roles/common/tasks/systemd-resolved.yml
# ---
systemd_resolved: true
# CyberGhost - Schnelle Verbindung mit Keine-Logs-Datenschutzrichtlinie
# Primäre DNS-Adresse: 38.132.106.139
# Sekundäre DNS-Adresse: 194.187.251.67
@@ -38,8 +32,8 @@ systemd_resolved: true
# IPv6: 2606:4700:4700::1111
# sekundäre DNS-Adresse
# IPv4: 1.0.0.1
# IPv6: 2606:4700:4700::1001
#
# IPv6: 2606:4700:4700::1001
#
# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit
# primäre DNS-Adresse
# IPv4: 8.8.8.8
@@ -50,20 +44,20 @@ systemd_resolved: true
#
# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug
# primäre DNS-Adresse
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# sekundäre DNS-Adresse
# IPv4: 149.112.112.112
# IPv6: 2620:fe::9
#
# OpenNIC - https://www.opennic.org/
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 194.36.144.87 - ns29.de
# IPv6: 2a00:f826:8:2::195 - ns31.de
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
# IPv4: 5.1.66.255
# IPv6: 2001:678:e68:f000::
# Servername für DNS-over-TLS: dot.ffmuc.net
@@ -73,10 +67,10 @@ resolved_nameserver:
# search domains
#
# If there are more than one search domains, then specify them here in the order in which
# If there are more than one search domains, then specify them here in the order in which
# the resolver should also search them
#
#resolved_domains: []
# resolved_domains: []
resolved_domains:
- anw-kb.netz
@@ -85,8 +79,7 @@ resolved_dnssec: false
# dns.as250.net: 194.150.168.168
#
resolved_fallback_nameserver:
- 172.16.32.254
- 172.16.32.254
# ---
# vars used by roles/common/tasks/sshd.yml
@@ -98,8 +91,7 @@ sshd_permit_root_login: !!str "yes"
sshd_password_authentication: !!str "yes"
#sshd_use_pam: !!str "no"
# sshd_use_pam: !!str "no"
# ---
# vars used by roles/common/tasks/cron.yml
@@ -111,12 +103,9 @@ cron_user_entries:
minute: "*/15"
job: /root/bin/monitoring/check_postfix.sh
cron_user_special_time_entries:
- name: "Restart DNS Cache service 'systemd-resolved'"
special_time: reboot
job: "sleep 10 ; /bin/systemctl restart systemd-resolved"
insertafter: PATH
+16 -27
View File
@@ -4,12 +4,11 @@
# vars used by roles/network_interfaces
# ---
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True
network_manage_devices: true
# Should the interfaces be reloaded after config change?
network_interface_reload: False
network_interface_reload: false
network_interface_path: /etc/network/interfaces.d
network_interface_required_packages:
@@ -19,7 +18,6 @@ network_interface_required_packages:
- ifupdown
- ifenslave
network_interfaces:
- device: br0
@@ -66,7 +64,7 @@ network_interfaces:
# inline hook scripts
pre-up:
- !!str "ip link set dev eno1 up" # pre-up script lines
up: [] #up script lines
up: [] # up script lines
post-up: [] # post-up script lines (alias for up)
pre-down: [] # pre-down script lines (alias for down)
down: [] # down script lines
@@ -80,22 +78,18 @@ network_interfaces:
address: 192.168.112.211
netmask: 32
# ---
# vars used by roles/common/tasks/basic.yml
# ---
set_default_limit_nofile: true
# ---
# vars used by roles/common/tasks/systemd-resolved.yml
# ---
systemd_resolved: true
# CyberGhost - Schnelle Verbindung mit Keine-Logs-Datenschutzrichtlinie
# Primäre DNS-Adresse: 38.132.106.139
# Sekundäre DNS-Adresse: 194.187.251.67
@@ -106,8 +100,8 @@ systemd_resolved: true
# IPv6: 2606:4700:4700::1111
# sekundäre DNS-Adresse
# IPv4: 1.0.0.1
# IPv6: 2606:4700:4700::1001
#
# IPv6: 2606:4700:4700::1001
#
# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit
# primäre DNS-Adresse
# IPv4: 8.8.8.8
@@ -118,20 +112,20 @@ systemd_resolved: true
#
# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug
# primäre DNS-Adresse
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# sekundäre DNS-Adresse
# IPv4: 149.112.112.112
# IPv6: 2620:fe::9
#
# OpenNIC - https://www.opennic.org/
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 194.36.144.87 - ns29.de
# IPv6: 2a00:f826:8:2::195 - ns31.de
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
# IPv4: 5.1.66.255
# IPv6: 2001:678:e68:f000::
# Servername für DNS-over-TLS: dot.ffmuc.net
@@ -141,10 +135,10 @@ resolved_nameserver:
# search domains
#
# If there are more than one search domains, then specify them here in the order in which
# If there are more than one search domains, then specify them here in the order in which
# the resolver should also search them
#
#resolved_domains: []
# resolved_domains: []
resolved_domains:
- oopen.de
@@ -153,8 +147,7 @@ resolved_dnssec: false
# dns.as250.net: 194.150.168.168
#
resolved_fallback_nameserver:
- 172.16.112.254
- 172.16.112.254
# ---
# vars used by roles/common/tasks/sshd.yml
@@ -166,8 +159,7 @@ sshd_permit_root_login: !!str "yes"
sshd_password_authentication: !!str "yes"
#sshd_use_pam: !!str "no"
# sshd_use_pam: !!str "no"
# ---
# vars used by roles/common/tasks/cron.yml
@@ -199,12 +191,9 @@ cron_user_entries:
hour: "23"
job: /root/bin/admin-stuff/cleanup_from_old_files.sh
cron_user_special_time_entries:
- name: "Restart DNS Cache service 'systemd-resolved'"
special_time: reboot
job: "sleep 10 ; /bin/systemctl restart systemd-resolved"
insertafter: PATH
+15 -23
View File
@@ -4,12 +4,11 @@
# vars used by roles/network_interfaces
# ---
# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted
network_manage_devices: True
network_manage_devices: true
# Should the interfaces be reloaded after config change?
network_interface_reload: False
network_interface_reload: false
network_interface_path: /etc/network/interfaces.d
network_interface_required_packages:
@@ -19,7 +18,6 @@ network_interface_required_packages:
- ifupdown
- ifenslave
network_interfaces:
- device: eno1
@@ -48,21 +46,18 @@ network_interfaces:
- 192.168.92.1
search: sprachenatelier.netz
# ---
# vars used by roles/common/tasks/basic.yml
# ---
set_default_limit_nofile: true
# ---
# vars used by roles/common/tasks/systemd-resolved.yml
# ---
systemd_resolved: true
# CyberGhost - Schnelle Verbindung mit Keine-Logs-Datenschutzrichtlinie
# Primäre DNS-Adresse: 38.132.106.139
# Sekundäre DNS-Adresse: 194.187.251.67
@@ -73,8 +68,8 @@ systemd_resolved: true
# IPv6: 2606:4700:4700::1111
# sekundäre DNS-Adresse
# IPv4: 1.0.0.1
# IPv6: 2606:4700:4700::1001
#
# IPv6: 2606:4700:4700::1001
#
# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit
# primäre DNS-Adresse
# IPv4: 8.8.8.8
@@ -85,20 +80,20 @@ systemd_resolved: true
#
# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug
# primäre DNS-Adresse
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# sekundäre DNS-Adresse
# IPv4: 149.112.112.112
# IPv6: 2620:fe::9
#
# OpenNIC - https://www.opennic.org/
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 194.36.144.87 - ns29.de
# IPv6: 2a00:f826:8:2::195 - ns31.de
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
# IPv4: 5.1.66.255
# IPv6: 2001:678:e68:f000::
# Servername für DNS-over-TLS: dot.ffmuc.net
@@ -108,10 +103,10 @@ resolved_nameserver:
# search domains
#
# If there are more than one search domains, then specify them here in the order in which
# If there are more than one search domains, then specify them here in the order in which
# the resolver should also search them
#
#resolved_domains: []
# resolved_domains: []
resolved_domains:
- oopen.de
@@ -120,8 +115,7 @@ resolved_dnssec: false
# dns.as250.net: 194.150.168.168
#
resolved_fallback_nameserver:
- 172.16.92.254
- 172.16.92.254
# ---
# vars used by roles/common/tasks/sshd.yml
@@ -133,8 +127,7 @@ sshd_permit_root_login: !!str "yes"
sshd_password_authentication: !!str "yes"
#sshd_use_pam: !!str "no"
# sshd_use_pam: !!str "no"
# ---
# vars used by roles/common/tasks/cron.yml
@@ -161,7 +154,6 @@ cron_user_entries:
hour: "7-22"
job: /root/bin/monitoring/check_cups-browsed.sh
cron_user_special_time_entries:
- name: "Restart DNS Cache service 'systemd-resolved'"