diff --git a/host_vars/file-fhxb.fhxb.netz.yml b/host_vars/file-fhxb.fhxb.netz.yml index 0ab2707..318701f 100644 --- a/host_vars/file-fhxb.fhxb.netz.yml +++ b/host_vars/file-fhxb.fhxb.netz.yml @@ -547,6 +547,29 @@ samba_user: - fhxb-sammlungen password: 'AI/.44Jt6rhY' + # Natalie Maier + - name : n.maier + groups: + - archiv + - ausstellungen + - buero + - forschung + - gedenken-im-stadtraum + - intern + - museum-organisation + - presse-orga-oeffentlichkeit + - projekte + - publikationen + - stolpersteine + - team + - technik + - veranstaltungen + - vermietung + - vze + - fhxb-bildarchiv + - fhxb-sammlungen + password: 'kI25L.pfQI/q' + # Norbert Schropp - name : n.schropp groups: diff --git a/host_vars/o12.oopen.de.yml b/host_vars/o12.oopen.de.yml index 3b9cdc1..fc55336 100644 --- a/host_vars/o12.oopen.de.yml +++ b/host_vars/o12.oopen.de.yml @@ -17,7 +17,6 @@ network_interface_required_packages: - ifmetric - ifupdown - ifenslave - - resolvconf network_interfaces: @@ -64,9 +63,7 @@ network_interfaces: # search: warenform.de # nameservers: - - 195.201.179.131 - - 95.217.204.204 - search: oopen.de + search: # optional additional subnets/ips subnets: [] # subnets: @@ -148,6 +145,76 @@ network_interfaces: # --- +# --- +# 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 +# +# Cloudflare (USA) Bester kostenloser DNS-Server für Gaming mit zuverlässigen Verbindungen +# primäre DNS-Adresse +# IPv4: 1.1.1.1 +# IPv6: 2606:4700:4700::1111 +# sekundäre DNS-Adresse +# IPv4: 1.0.0.1 +# 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 +# IPv6: 2001:4860:4860::8888 +# sekundäre DNS-Adresse +# IPv4: 8.8.4.4 +# IPv6: 2001:4860:4860::8844 +# +# 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 +# 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: 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) +# IPv4: 5.1.66.255 +# IPv6: 2001:678:e68:f000:: +# Servername für DNS-over-TLS: dot.ffmuc.net +# IPv4: 185.150.99.255 +# IPv6: 2001:678:ed0:f000:: +# Servername für DNS-over-TLS: dot.ffmuc.net +# für iOS 14+: DoT-Server-Konfiguration (unsigniert, vom PrHdb) +resolved_nameserver: + - 195.201.179.131 + - 95.217.204.204 + +# search domains +# +# 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: + - oopen.de + +resolved_dnssec: true + +# dns.as250.net: 194.150.168.168 +# +resolved_fallback_nameserver: + - 194.150.168.168 + + # --- # vars used by roles/common/tasks/users.yml # --- diff --git a/host_vars/o13.oopen.de.yml b/host_vars/o13.oopen.de.yml index 9de93a6..cdc2eae 100644 --- a/host_vars/o13.oopen.de.yml +++ b/host_vars/o13.oopen.de.yml @@ -33,7 +33,7 @@ network_interfaces: family: inet method: manual hwaddress: 52:54:00:62:fb:9c - description: Bridge Interface IPv4 for LXC + description: address: netmask: gateway: diff --git a/host_vars/o17.oopen.de.yml b/host_vars/o17.oopen.de.yml index 436c469..dc14a81 100644 --- a/host_vars/o17.oopen.de.yml +++ b/host_vars/o17.oopen.de.yml @@ -33,7 +33,7 @@ network_interfaces: family: inet method: manual hwaddress: 52:54:00:48:ce:dc - description: Bridge Interface IPv4 for LXC + description: address: netmask: gateway: diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.bl-hosts b/roles/common/files/mailserver/etc/postfix/postfwd.bl-hosts index 6d8d3da..dbdc6a1 100644 --- a/roles/common/files/mailserver/etc/postfix/postfwd.bl-hosts +++ b/roles/common/files/mailserver/etc/postfix/postfwd.bl-hosts @@ -80,3 +80,4 @@ hunshachang\.com$ likelark\.com$ mlmlh\.xyz$ osdh\.net$ +trentbbs\.com$ diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets b/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets index 1317092..7509536 100644 --- a/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets +++ b/roles/common/files/mailserver/etc/postfix/postfwd.bl-nets @@ -166,3 +166,5 @@ 46.36.39.0/24 # US 91.193.19.0/24 +# US +103.125.147.0/24 diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender b/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender index 08c5f60..e3fc086 100644 --- a/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender +++ b/roles/common/files/mailserver/etc/postfix/postfwd.bl-sender @@ -110,3 +110,4 @@ joshua24\.com$ cityboxing\.com$ clotheswithoutlimits\.com$ distrowatch\.com$ +designerwicker\.com$ diff --git a/roles/network_interfaces/templates/etc/network/interfaces.d/device.j2 b/roles/network_interfaces/templates/etc/network/interfaces.d/device.j2 index 2b978fb..b9d866b 100644 --- a/roles/network_interfaces/templates/etc/network/interfaces.d/device.j2 +++ b/roles/network_interfaces/templates/etc/network/interfaces.d/device.j2 @@ -17,7 +17,11 @@ auto {{ config.device }} allow-{{ stanza }} {% endfor -%} iface {{ config.device }} {{ config.family | default('inet', true) }} {{ config.method | default('static', true) }} -{% if config.method == "static" %} +{% if config.method == "manual" %} +{% if config.hwaddress is defined and config.hwaddress %} + hwaddress {{ config.hwaddress }} +{% endif %} +{% elif config.method == "static" %} {% if (config.description is defined and config.description) %} description {{ config.description }} {% endif %}