diff --git a/host_vars/172.16.82.197.yml b/host_vars/172.16.82.197.yml deleted file mode 100644 index 5e1d84e..0000000 --- a/host_vars/172.16.82.197.yml +++ /dev/null @@ -1,175 +0,0 @@ ---- - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -copy_additional_plain_files_sysctl: - - - name: enable-ipv6 - src_path: etc/sysctl.d/30-enable-ipv6.conf - dest_path: /etc/sysctl.d/30-enable-ipv6.conf - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - -#sshd_hostkeyalgorithms: -# - ssh-ed25519 -# - ssh-ed25519-cert-v01@openssh.com -# - rsa-sha2-256 -# - rsa-sha2-512 -# - ecdsa-sha2-nistp256 -# - rsa-sha2-256-cert-v01@openssh.com -# - rsa-sha2-512-cert-v01@openssh.com - - -# --- -# vars used by roles/common/tasks/apt.yml -# --- - - -# --- -# 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: - - 127.0.0.1 - -# 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: - - ~. - - akb.netz - -resolved_dnssec: false - -# dns.as250.net: 194.150.168.168 -# -resolved_fallback_nameserver: - - 194.150.168.168 - - -# --- -# vars used by roles/common/tasks/cron.yml -# --- - -cron_user_special_time_entries: - - - name: "Restart NTP service 'ntpsec'" - special_time: reboot - job: "sleep 15 ; /bin/systemctl restart ntpsec" - insertafter: PATH - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - -git_firewall_repository: - name: ipt-gateway - repo: https://git.oopen.de/firewall/ipt-gateway - dest: /usr/local/src/ipt-gateway - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - -install_bind_packages: true - -bind9_gateway_listen_on_v6: - - none - -bind9_gateway_listen_on: - - any - -# ============================== - - -# --- -# vars used by scripts/reset_root_passwd.yml -# --- - -root_user: - name: root - password: $y$j9T$IVBTpn.OrI6YiQ9q3fA8b1$Y1bmID5yXJbKfoLFt1VmQs6LezeTj5/1M9ppZBD2Pn4 - diff --git a/host_vars/a.mx.oopen.de.yml b/host_vars/a.mx.oopen.de/a.mx-common.yml similarity index 100% rename from host_vars/a.mx.oopen.de.yml rename to host_vars/a.mx.oopen.de/a.mx-common.yml diff --git a/host_vars/a.mx.oopen.de/ipt-server.yml b/host_vars/a.mx.oopen.de/a.mx-ipt-server.yml similarity index 100% rename from host_vars/a.mx.oopen.de/ipt-server.yml rename to host_vars/a.mx.oopen.de/a.mx-ipt-server.yml diff --git a/host_vars/a.ns.oopen.de.yml b/host_vars/a.ns.oopen.de/a.ns-common.yml similarity index 100% rename from host_vars/a.ns.oopen.de.yml rename to host_vars/a.ns.oopen.de/a.ns-common.yml diff --git a/host_vars/a.ns.oopen.de/ipt-server.yml b/host_vars/a.ns.oopen.de/a.ns-ipt-server.yml similarity index 100% rename from host_vars/a.ns.oopen.de/ipt-server.yml rename to host_vars/a.ns.oopen.de/a.ns-ipt-server.yml diff --git a/host_vars/ak-plan.oopen.de.yml b/host_vars/ak-plan.oopen.de/ak-plan-common.yml similarity index 100% rename from host_vars/ak-plan.oopen.de.yml rename to host_vars/ak-plan.oopen.de/ak-plan-common.yml diff --git a/host_vars/anita.wf.netz.yml b/host_vars/anita.wf.netz/anita-common.yml similarity index 100% rename from host_vars/anita.wf.netz.yml rename to host_vars/anita.wf.netz/anita-common.yml diff --git a/host_vars/at-10-neu.ak.netz.yml b/host_vars/at-10-neu.ak.netz/at-10-neu-common.yml similarity index 100% rename from host_vars/at-10-neu.ak.netz.yml rename to host_vars/at-10-neu.ak.netz/at-10-neu-common.yml diff --git a/host_vars/b.mx.oopen.de.yml b/host_vars/b.mx.oopen.de/b.mx-common.yml similarity index 100% rename from host_vars/b.mx.oopen.de.yml rename to host_vars/b.mx.oopen.de/b.mx-common.yml diff --git a/host_vars/b.mx.oopen.de/ipt-server.yml b/host_vars/b.mx.oopen.de/b.mx-ipt-server.yml similarity index 100% rename from host_vars/b.mx.oopen.de/ipt-server.yml rename to host_vars/b.mx.oopen.de/b.mx-ipt-server.yml diff --git a/host_vars/b.ns.oopen.de.yml b/host_vars/b.ns.oopen.de/b.ns-common.yml similarity index 100% rename from host_vars/b.ns.oopen.de.yml rename to host_vars/b.ns.oopen.de/b.ns-common.yml diff --git a/host_vars/b.ns.oopen.de/ipt-server.yml b/host_vars/b.ns.oopen.de/b.ns-ipt-server.yml similarity index 100% rename from host_vars/b.ns.oopen.de/ipt-server.yml rename to host_vars/b.ns.oopen.de/b.ns-ipt-server.yml diff --git a/host_vars/backup.oopen.de.yml b/host_vars/backup.oopen.de/backup-common.yml similarity index 100% rename from host_vars/backup.oopen.de.yml rename to host_vars/backup.oopen.de/backup-common.yml diff --git a/host_vars/backup.oopen.de/ipt-server.yml b/host_vars/backup.oopen.de/backup-ipt-server.yml similarity index 100% rename from host_vars/backup.oopen.de/ipt-server.yml rename to host_vars/backup.oopen.de/backup-ipt-server.yml diff --git a/host_vars/backup.warenform.de.yml b/host_vars/backup.warenform.de/backup-common.yml similarity index 100% rename from host_vars/backup.warenform.de.yml rename to host_vars/backup.warenform.de/backup-common.yml diff --git a/host_vars/backup.warenform.de/ipt-server.yml b/host_vars/backup.warenform.de/backup-ipt-server.yml similarity index 100% rename from host_vars/backup.warenform.de/ipt-server.yml rename to host_vars/backup.warenform.de/backup-ipt-server.yml diff --git a/host_vars/bbb-server.b3-bornim.netz.yml b/host_vars/bbb-server.b3-bornim.netz/bbb-server-common.yml similarity index 100% rename from host_vars/bbb-server.b3-bornim.netz.yml rename to host_vars/bbb-server.b3-bornim.netz/bbb-server-common.yml diff --git a/host_vars/c.mx.oopen.de.yml b/host_vars/c.mx.oopen.de/c.mx-common.yml similarity index 100% rename from host_vars/c.mx.oopen.de.yml rename to host_vars/c.mx.oopen.de/c.mx-common.yml diff --git a/host_vars/cl-01.oopen.de.yml b/host_vars/cl-01.oopen.de/cl-01-common.yml similarity index 100% rename from host_vars/cl-01.oopen.de.yml rename to host_vars/cl-01.oopen.de/cl-01-common.yml diff --git a/host_vars/cl-01.oopen.de/ipt-server.yml b/host_vars/cl-01.oopen.de/cl-01-ipt-server.yml similarity index 100% rename from host_vars/cl-01.oopen.de/ipt-server.yml rename to host_vars/cl-01.oopen.de/cl-01-ipt-server.yml diff --git a/host_vars/cl-02.oopen.de.yml b/host_vars/cl-02.oopen.de/cl-02-common.yml similarity index 100% rename from host_vars/cl-02.oopen.de.yml rename to host_vars/cl-02.oopen.de/cl-02-common.yml diff --git a/host_vars/cl-02.oopen.de/ipt-server.yml b/host_vars/cl-02.oopen.de/cl-02-ipt-server.yml similarity index 100% rename from host_vars/cl-02.oopen.de/ipt-server.yml rename to host_vars/cl-02.oopen.de/cl-02-ipt-server.yml diff --git a/host_vars/cl-dissens.oopen.de.yml b/host_vars/cl-dissens.oopen.de/cl-dissens-common.yml similarity index 100% rename from host_vars/cl-dissens.oopen.de.yml rename to host_vars/cl-dissens.oopen.de/cl-dissens-common.yml diff --git a/host_vars/cl-dissens.oopen.de/ipt-server.yml b/host_vars/cl-dissens.oopen.de/cl-dissens-ipt-server.yml similarity index 100% rename from host_vars/cl-dissens.oopen.de/ipt-server.yml rename to host_vars/cl-dissens.oopen.de/cl-dissens-ipt-server.yml diff --git a/host_vars/cl-flr.oopen.de.yml b/host_vars/cl-flr.oopen.de/cl-flr-common.yml similarity index 100% rename from host_vars/cl-flr.oopen.de.yml rename to host_vars/cl-flr.oopen.de/cl-flr-common.yml diff --git a/host_vars/cl-flr.oopen.de/ipt-server.yml b/host_vars/cl-flr.oopen.de/cl-flr-ipt-server.yml similarity index 100% rename from host_vars/cl-flr.oopen.de/ipt-server.yml rename to host_vars/cl-flr.oopen.de/cl-flr-ipt-server.yml diff --git a/host_vars/cl-fm.oopen.de.yml b/host_vars/cl-fm.oopen.de/cl-fm-common.yml similarity index 100% rename from host_vars/cl-fm.oopen.de.yml rename to host_vars/cl-fm.oopen.de/cl-fm-common.yml diff --git a/host_vars/cl-fm.oopen.de/ipt-server.yml b/host_vars/cl-fm.oopen.de/cl-fm-ipt-server.yml similarity index 100% rename from host_vars/cl-fm.oopen.de/ipt-server.yml rename to host_vars/cl-fm.oopen.de/cl-fm-ipt-server.yml diff --git a/host_vars/cl-irights-neu.oopen.de.yml b/host_vars/cl-irights-neu.oopen.de.yml deleted file mode 100644 index 7aabdf0..0000000 --- a/host_vars/cl-irights-neu.oopen.de.yml +++ /dev/null @@ -1,151 +0,0 @@ ---- - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - -sshd_permit_root_login: !!str "prohibit-password" - -# --- -# vars used by apt.yml -# --- - - -# --- -# 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: - - 185.12.64.2 - - 2a01:4ff:ff00::add:1 - - 185.12.64.1 - - 2a01:4ff:ff00::add:2 - -# 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: false - -# dns.as250.net: 194.150.168.168 -# -resolved_fallback_nameserver: - - 194.150.168.168 - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - -sudo_users: - - chris - - sysadm - - localadmin - - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - -sudoers_file_user_privileges: - - name: back - entry: 'ALL=(www-data) NOPASSWD: /usr/local/php/bin/php' - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - - -# --- -# vars used by roles/common/tasks/git.yml -# --- -# -# see: roles/common/tasks/vars - - -# ============================== - - -# --- -# vars used by scripts/reset_root_passwd.yml -# --- - diff --git a/host_vars/cl-irights.oopen.de.yml b/host_vars/cl-irights.oopen.de/cl-irights-common.yml similarity index 100% rename from host_vars/cl-irights.oopen.de.yml rename to host_vars/cl-irights.oopen.de/cl-irights-common.yml diff --git a/host_vars/cl-irights.oopen.de/ipt-server.yml b/host_vars/cl-irights.oopen.de/cl-irights-ipt-server.yml similarity index 100% rename from host_vars/cl-irights.oopen.de/ipt-server.yml rename to host_vars/cl-irights.oopen.de/cl-irights-ipt-server.yml diff --git a/host_vars/cl-lubax.oopen.de.yml b/host_vars/cl-lubax.oopen.de/cl-lubax-common.yml similarity index 100% rename from host_vars/cl-lubax.oopen.de.yml rename to host_vars/cl-lubax.oopen.de/cl-lubax-common.yml diff --git a/host_vars/cl-lubax.oopen.de/ipt-server.yml b/host_vars/cl-lubax.oopen.de/cl-lubax-ipt-server.yml similarity index 100% rename from host_vars/cl-lubax.oopen.de/ipt-server.yml rename to host_vars/cl-lubax.oopen.de/cl-lubax-ipt-server.yml diff --git a/host_vars/cl-nd-test.oopen.de/cl-nd-test-common.yml b/host_vars/cl-nd-test.oopen.de/cl-nd-test-common.yml new file mode 100644 index 0000000..dc6e543 --- /dev/null +++ b/host_vars/cl-nd-test.oopen.de/cl-nd-test-common.yml @@ -0,0 +1,126 @@ +--- +# --- +# vars used by roles/common/tasks/basic.yml +# --- + +# --- +# vars used by roles/common/tasks/sshd.yml +# --- + +sshd_permit_root_login: !!str "prohibit-password" + +# --- +# vars used by apt.yml +# --- + +# --- +# vars used by roles/common/tasks/systemd-resolved.yml +# --- + +systemd_resolved: true + +resolved_nameserver: + - 185.12.64.2 + - 185.12.64.1 + - 2a01:4ff:ff00::add:2 + - 2a01:4ff:ff00::add:1 + +resolved_domains: + - ~. + - oopen.de + +resolved_dnssec: false + +resolved_fallback_nameserver: + - 194.150.168.168 + +# --- +# vars used by roles/common/tasks/cron.yml +# --- + +cron_env_entries: + - name: PATH + job: /root/bin/admin-stuff:/root/bin:/usr/local/apache2/bin:/usr/local/php/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + + - name: SHELL + job: /bin/bash + insertafter: PATH + +cron_user_special_time_entries: + - name: "Restart DNS Cache service 'systemd-resolved'" + special_time: reboot + job: "sleep 5 ; /bin/systemctl restart systemd-resolved" + insertafter: PATH + +cron_user_entries: + - name: "Check if webservices sre running. Restart if necessary" + minute: "*/5" + hour: "*" + job: /root/bin/monitoring/check_webservice_load.sh + + - name: "Check if SSH service is running. Restart service if needed." + minute: "*/5" + hour: "*" + job: /root/bin/monitoring/check_ssh.sh + + - name: "Check if Postfix Mailservice is up and running?" + minute: "*/15" + hour: "*" + job: /root/bin/monitoring/check_postfix.sh + + - name: "Check Postfix E-Mail LOG file for 'fatal' errors.." + minute: "*/5" + hour: "*" + job: /root/bin/postfix/check-postfix-fatal-errors.sh + + - name: "Optimize mysql tables" + minute: "53" + hour: "04" + job: /root/bin/mysql/optimize_mysql_tables.sh + + - name: "Flush query cache for mysql tables" + minute: "27" + hour: "04" + job: /root/bin/mysql/flush_query_cache.sh + + - name: "Flush Host cache" + minute: "17" + hour: "05" + job: /root/bin/mysql/flush_host_cache.sh + + - name: "Run occ file:scan for each cloud account" + minute: "02" + hour: "23" + job: /root/bin/nextcloud/occ_maintenance.sh -s cloud-test.ndhosting.de + + - name: "Background job for nextcloud instance 'cloud-test.ndhosting.de" + minute: "*/15" + hour: "*" + job: sudo -u "www-data" /usr/local/php/bin/php -f /var/www/cloud-test.ndhosting.de/htdocs/cron.php + + - name: "Generate/Renew Let's Encrypt Certificates if needed (using dehydrated script)" + minute: "23" + hour: "05" + job: /var/lib/dehydrated/cron/dehydrated_cron.sh + + - name: "Check whether all certificates are included in the VHOST configurations" + minute: "33" + hour: "05" + job: /var/lib/dehydrated/tools/update_ssl_directives.sh + +# --- +# vars used by roles/common/tasks/users.yml +# --- + +sudo_users: + - chris + - sysadm + - localadmin + +# --- +# vars used by roles/common/tasks/sudoers.yml +# --- + +sudoers_file_user_privileges: + - name: back + entry: "ALL=(www-data) NOPASSWD: /usr/local/php/bin/php" diff --git a/host_vars/cl-nd-test.oopen.de/cl-nd-test-ipt-server.yml b/host_vars/cl-nd-test.oopen.de/cl-nd-test-ipt-server.yml new file mode 100644 index 0000000..edbd76c --- /dev/null +++ b/host_vars/cl-nd-test.oopen.de/cl-nd-test-ipt-server.yml @@ -0,0 +1,24 @@ +--- +# ipt-firewall configuration for a.mx.oopen.de +# Generated by extract-fw-host-vars.py - review before committing! +# Place in: host_vars//ipt_firewall.yml + +fw_manage_config: true + +# --- Network +fw_ext_interfaces: + - "eth0" +fw_ext_ips_v4: + - "135.181.90.132" +fw_ext_ips_v6: + - "2a01:4f9:c014:1ba8::1" + +# --- Munin +munin_remote_ipv4: 37.27.121.227 +munin_remote_ipv6: "2a01:4f9:3070:2bda::227" + +# --- HTTP +fw_http_server_ips: $ext_1_ip + +# --- Mail +fw_mail_client_ips: $ext_1_ip diff --git a/host_vars/cl-nd.oopen.de.yml b/host_vars/cl-nd.oopen.de/cl-nd-common.yml similarity index 100% rename from host_vars/cl-nd.oopen.de.yml rename to host_vars/cl-nd.oopen.de/cl-nd-common.yml diff --git a/host_vars/cl-ndm.oopen.de.yml b/host_vars/cl-ndm.oopen.de/cl-ndm-common.yml similarity index 100% rename from host_vars/cl-ndm.oopen.de.yml rename to host_vars/cl-ndm.oopen.de/cl-ndm-common.yml diff --git a/host_vars/cl-ndm.oopen.de/ipt-server.yml b/host_vars/cl-ndm.oopen.de/cl-ndm-ipt-server.yml similarity index 100% rename from host_vars/cl-ndm.oopen.de/ipt-server.yml rename to host_vars/cl-ndm.oopen.de/cl-ndm-ipt-server.yml diff --git a/host_vars/cl-opp.oopen.de.yml b/host_vars/cl-opp.oopen.de/cl-opp-common.yml similarity index 100% rename from host_vars/cl-opp.oopen.de.yml rename to host_vars/cl-opp.oopen.de/cl-opp-common.yml diff --git a/host_vars/cl-test.oopen.de.yml b/host_vars/cl-test.oopen.de/cl-test-common.yml similarity index 100% rename from host_vars/cl-test.oopen.de.yml rename to host_vars/cl-test.oopen.de/cl-test-common.yml diff --git a/host_vars/cl-vbrg.oopen.de.yml b/host_vars/cl-vbrg.oopen.de/cl-vbrg-common.yml similarity index 100% rename from host_vars/cl-vbrg.oopen.de.yml rename to host_vars/cl-vbrg.oopen.de/cl-vbrg-common.yml diff --git a/host_vars/cloud-giz.warenform.de.yml b/host_vars/cloud-giz.warenform.de/cloud-giz-common.yml similarity index 100% rename from host_vars/cloud-giz.warenform.de.yml rename to host_vars/cloud-giz.warenform.de/cloud-giz-common.yml diff --git a/host_vars/cloud.akweb.de.yml b/host_vars/cloud.akweb.de/cloud-common.yml similarity index 100% rename from host_vars/cloud.akweb.de.yml rename to host_vars/cloud.akweb.de/cloud-common.yml diff --git a/host_vars/cp-01.oopen.de.yml b/host_vars/cp-01.oopen.de/cp-01-common.yml similarity index 100% rename from host_vars/cp-01.oopen.de.yml rename to host_vars/cp-01.oopen.de/cp-01-common.yml diff --git a/host_vars/cp-flr.oopen.de.yml b/host_vars/cp-flr.oopen.de/cp-flr-common.yml similarity index 100% rename from host_vars/cp-flr.oopen.de.yml rename to host_vars/cp-flr.oopen.de/cp-flr-common.yml diff --git a/host_vars/d.mx.oopen.de.yml b/host_vars/d.mx.oopen.de/d.mx-common.yml similarity index 100% rename from host_vars/d.mx.oopen.de.yml rename to host_vars/d.mx.oopen.de/d.mx-common.yml diff --git a/host_vars/dc-opp.oopen.de.yml b/host_vars/dc-opp.oopen.de/dc-opp-common.yml similarity index 100% rename from host_vars/dc-opp.oopen.de.yml rename to host_vars/dc-opp.oopen.de/dc-opp-common.yml diff --git a/host_vars/devel-cloud.wf.netz.yml b/host_vars/devel-cloud.wf.netz/devel-cloud-common.yml similarity index 100% rename from host_vars/devel-cloud.wf.netz.yml rename to host_vars/devel-cloud.wf.netz/devel-cloud-common.yml diff --git a/host_vars/devel-db.wf.netz.yml b/host_vars/devel-db.wf.netz/devel-db-common.yml similarity index 100% rename from host_vars/devel-db.wf.netz.yml rename to host_vars/devel-db.wf.netz/devel-db-common.yml diff --git a/host_vars/devel-php.wf.netz.yml b/host_vars/devel-php.wf.netz/devel-php-common.yml similarity index 100% rename from host_vars/devel-php.wf.netz.yml rename to host_vars/devel-php.wf.netz/devel-php-common.yml diff --git a/host_vars/devel-repos.wf.netz.yml b/host_vars/devel-repos.wf.netz/devel-repos-common.yml similarity index 100% rename from host_vars/devel-repos.wf.netz.yml rename to host_vars/devel-repos.wf.netz/devel-repos-common.yml diff --git a/host_vars/devel-root.wf.netz.yml b/host_vars/devel-root.wf.netz/devel-root-common.yml similarity index 100% rename from host_vars/devel-root.wf.netz.yml rename to host_vars/devel-root.wf.netz/devel-root-common.yml diff --git a/host_vars/devel-wiki.wf.netz.yml b/host_vars/devel-wiki.wf.netz/devel-wiki-common.yml similarity index 100% rename from host_vars/devel-wiki.wf.netz.yml rename to host_vars/devel-wiki.wf.netz/devel-wiki-common.yml diff --git a/host_vars/dns0.warenform.de.yml b/host_vars/dns0.warenform.de/dns0-common.yml similarity index 100% rename from host_vars/dns0.warenform.de.yml rename to host_vars/dns0.warenform.de/dns0-common.yml diff --git a/host_vars/dns1.warenform.de.yml b/host_vars/dns1.warenform.de/dns1-common.yml similarity index 100% rename from host_vars/dns1.warenform.de.yml rename to host_vars/dns1.warenform.de/dns1-common.yml diff --git a/host_vars/e.mx.oopen.de.yml b/host_vars/e.mx.oopen.de/e.mx-common.yml similarity index 100% rename from host_vars/e.mx.oopen.de.yml rename to host_vars/e.mx.oopen.de/e.mx-common.yml diff --git a/host_vars/file-ah.kanzlei-kiel.netz.yml b/host_vars/file-ah.kanzlei-kiel.netz/file-ah-common.yml similarity index 100% rename from host_vars/file-ah.kanzlei-kiel.netz.yml rename to host_vars/file-ah.kanzlei-kiel.netz/file-ah-common.yml diff --git a/host_vars/file-blkr-alt.blkr.netz.yml b/host_vars/file-blkr-alt.blkr.netz/file-blkr-alt-common.yml similarity index 100% rename from host_vars/file-blkr-alt.blkr.netz.yml rename to host_vars/file-blkr-alt.blkr.netz/file-blkr-alt-common.yml diff --git a/host_vars/file-blkr.blkr.netz.yml b/host_vars/file-blkr.blkr.netz/file-blkr-common.yml similarity index 96% rename from host_vars/file-blkr.blkr.netz.yml rename to host_vars/file-blkr.blkr.netz/file-blkr-common.yml index 91a6ba4..0aead0f 100644 --- a/host_vars/file-blkr.blkr.netz.yml +++ b/host_vars/file-blkr.blkr.netz/file-blkr-common.yml @@ -392,6 +392,26 @@ samba_user: - verwaltung password: 'q.Y-q/3r9j.E' + - name: buchhaltung + groups: + - buero + password: '7RcK/j3Sez-y' + + - name: wimi + groups: + - buero + password: 'c2F.v.xd49-I' + + - name: refa1 + groups: + - buero + password: '3hp-hf7Pym.J' + + - name: refi-m40 + groups: + - buero + password: 'VX.S.3zKr446' + # - name: lap-02 # groups: diff --git a/host_vars/file-dissens.dissens.netz.yml b/host_vars/file-dissens.dissens.netz/file-dissens-common.yml similarity index 100% rename from host_vars/file-dissens.dissens.netz.yml rename to host_vars/file-dissens.dissens.netz/file-dissens-common.yml diff --git a/host_vars/file-ebs.ebs.netz.yml b/host_vars/file-ebs.ebs.netz/file-ebs-common.yml similarity index 100% rename from host_vars/file-ebs.ebs.netz.yml rename to host_vars/file-ebs.ebs.netz/file-ebs-common.yml diff --git a/host_vars/file-fhxb.fhxb.netz.yml b/host_vars/file-fhxb.fhxb.netz/file-fhxb-common.yml similarity index 100% rename from host_vars/file-fhxb.fhxb.netz.yml rename to host_vars/file-fhxb.fhxb.netz/file-fhxb-common.yml diff --git a/host_vars/file-fm.fm.netz.yml b/host_vars/file-fm.fm.netz/file-fm-common.yml similarity index 100% rename from host_vars/file-fm.fm.netz.yml rename to host_vars/file-fm.fm.netz/file-fm-common.yml diff --git a/host_vars/file-ipa.local.netz.yml b/host_vars/file-ipa.local.netz/file-ipa-common.yml similarity index 100% rename from host_vars/file-ipa.local.netz.yml rename to host_vars/file-ipa.local.netz/file-ipa-common.yml diff --git a/host_vars/file-kb.anw-kb.netz.yml b/host_vars/file-kb.anw-kb.netz/file-kb-common.yml similarity index 100% rename from host_vars/file-kb.anw-kb.netz.yml rename to host_vars/file-kb.anw-kb.netz/file-kb-common.yml diff --git a/host_vars/file-km-alt.anw-km.netz.yml b/host_vars/file-km-alt.anw-km.netz/file-km-alt-common.yml similarity index 100% rename from host_vars/file-km-alt.anw-km.netz.yml rename to host_vars/file-km-alt.anw-km.netz/file-km-alt-common.yml diff --git a/host_vars/file-km.anw-km.netz.yml.BAK.2026-04-18-1218 b/host_vars/file-km.anw-km.netz.yml.BAK.2026-04-18-1218 deleted file mode 100644 index 0797d30..0000000 --- a/host_vars/file-km.anw-km.netz.yml.BAK.2026-04-18-1218 +++ /dev/null @@ -1,774 +0,0 @@ ---- - -# --- -# vars used by roles/network_interfaces -# --- - - -# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted -network_manage_devices: True - -# Should the interfaces be reloaded after config change? -network_interface_reload: False - -network_interface_path: /etc/network/interfaces.d -network_interface_required_packages: - - vlan - - bridge-utils - - ifmetric - - ifupdown - - ifenslave - - -network_interfaces: - - - device: br0 - # use only once per device (for the first device entry) - headline: br0 - bridge over device enp97s0 - - # auto & allow are only used for the first device entry - allow: [] # array of allow-[stanzas] eg. allow-hotplug - auto: true - - family: inet - method: static - description: - address: 192.168.122.10 - netmask: 24 - gateway: 192.168.122.254 - - # optional dns settings nameservers: [] - # - # nameservers: - # - 194.150.168.168 # dns.as250.net - # - 91.239.100.100 # anycast.censurfridns.dk - # search: warenform.de - # - - # optional bridge parameters bridge: {} - # bridge: - # ports: - # stp: - # fd: - # maxwait: - # waitport: - bridge: - ports: enp97s0 # for mor devices support a blank separated list - stp: !!str off - fd: 5 - hello: 2 - maxage: 12 - - # inline hook scripts - pre-up: - - !!str "ip link set dev enp97s0 up" # pre-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 - post-down: [] # post-down script lines - - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - - -# --- -# vars used by roles/common/tasks/apt.yml -# --- - - -# --- -# 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: - - 192.168.122.1 - -# 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: - - ~. - - anw-km.netz - -resolved_dnssec: false - -# dns.as250.net: 194.150.168.168 -# -resolved_fallback_nameserver: - - 172.16.122.254 - - -# --- -# vars used by roles/common/tasks/cron.yml -# --- - -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 - - - name: "Activate ksm support" - special_time: reboot - job: "echo 1 > /sys/kernel/mm/ksm/run" - insertafter: PATH - - -cron_user_entries: - - - name: "Check if SSH service is running. Restart service if needed." - minute: '*/5' - hour: '*' - job: /root/bin/monitoring/check_ssh.sh - - - name: "Check if postfix mailservice is running. Restart service if needed." - minute: "*/5" - hour: "*" - job: /root/bin/monitoring/check_postfix.sh - - - name: "Check Postfix E-Mail LOG file for 'fatal' errors." - minute: "*/30" - hour: "*" - job: /root/bin/postfix/check-postfix-fatal-errors.sh - - - name: "Clean up Samba Trash Dirs" - minute: "02" - hour: "23" - job: /root/bin/samba/clean_samba_trash.sh - - - name: "Set (group and access) Permissons for Samba shares" - minute: "14" - hour: "23" - job: /root/bin/samba/set_permissions_samba_shares.sh - - - name: "Check if ntpsec is running. Restart service if needed." - minute: "*/6" - hour: "*" - job: /root/bin/monitoring/check_ntpsec_service.sh - - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - -sudoers_file_user_back_mount_privileges: - - 'ALL=(root) NOPASSWD: /usr/bin/mount' - - 'ALL=(root) NOPASSWD: /usr/bin/umount' - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - - -# --- -# vars used by roles/common/tasks/git.yml -# --- - - -# --- -# vars used by roles/common/tasks/samba-config-server.yml -# vars used by roles/common/tasks/samba-user.yml -# --- - -samba_server_ip: 192.168.122.10 -samba_server_cidr_prefix: 24 - -samba_workgroup: WORKGROUP - -samba_netbios_name: FILE-KM - -samba_server_min_protocol: !!str NT1 - -samba_groups: - - name: kanzlei - group_id: 1100 - - name: a-jur - group_id: 1110 - - name: intern - group_id: 1120 - - name: wildvang - group_id: 1130 - #- name: aulmann - # group_id: 1130 - #- name: howe - # group_id: 1140 - - name: stahmann - group_id: 1150 - - name: traine - group_id: 1160 - - name: public - group_id: 1170 - - name: alle - group_id: 1180 - - - -samba_user: - - - name: advoware - groups: - - advoware - password: '9WNRbc49m3' - - - name: a-jur - groups: - - a-jur - - alle - - intern - - kanzlei - password: 'a-jur' - - - name: andrea - groups: - - advoware - - aulmann - - howe - - stahmann - - traine - - public - password: 'fXc3bmK9gj' - - - name: andreas - groups: - - a-jur - - advoware - - alle - - kanzlei - password: 'YKQRa.M9-6rL' - - - name: aphex2 - groups: - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'J3KMRprK9H' - - - name: berenice - groups: - - advoware - - kanzlei - - a-jur - - alle - password: 'berenice' - - - name: beuster - groups: - - advoware - - aulmann - - howe - - stahmann - - traine - - public - - alle - password: 'zlm17Kx' - - - name: buero - groups: - - advoware - - kanzlei - - a-jur - - alle - password: 'buero' - - - name: buero2 - groups: - - advoware - - kanzlei - - a-jur - - alle - password: 'buero2' - - - name: buero3 - groups: - - advoware - - kanzlei - - a-jur - - alle - password: 'buero3' - - - name: buero4 - groups: - - advoware - - kanzlei - - a-jur - - alle - password: 'buero4' - - - name: buero7 - groups: - - advoware - - kanzlei - - a-jur - - alle - password: 'buero7' - - - name: chris - groups: - - a-jur - - advoware - - alle - - aulmann - - intern - - kanzlei - - stahmann - - traine - - public - password: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 30383265366434633965346530666535363761396165393434643665393137353765653739636364 - 6330623334353763613065343336306434376335646666380a363030363335656261656236636562 - 63663763616630383264303039336562626537366634303636356237323630666635356130383165 - 3837613337343533650a663061366230353531316535656433643162353063383534323833323138 - 3430 - - - name: christina - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'qvR7zX4Lhs' - - - name: federico - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'zHfj9g3NcC' - -# - name: gerhard -# groups: -# - advoware -# - alle -# - aulmann -# - howe -# - stahmann -# - traine -# - public -# password: 'bHdhzWnTj9' - - - name: ho-st1 - groups: - - alle - - howe - - stahmann - password: '44-Ro-440' - -# - name: howe-staff-1 -# groups: -# - advoware -# - alle -# - aulmann -# - howe -# password: '' - - - name: irina - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'W9NKv39pXW' - - - name: jessica - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'bV3pjPtjkR' - -# - name: laura -# groups: -# - alle -# - aulmann -# - howe -# - stahmann -# - traine -# password: '99-Hamburg-990' - - - name: lenovo3 - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'fndvLmrt7W' - - - name: lenovo4 - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'tpCMmTKj7H' - - - name: lenovo5 - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: 'L5Hannover51' - - - name: lenovo6 - groups: - - advoware - - alle - - aulmann - - howe - - stahmann - - traine - password: '66koeln66' - - - name: rm-buero1 - groups: - - advoware - - alle - - a-jur - - kanzlei - password: '' - - - name: rm-buero2 - groups: - - advoware - - alle - - a-jur - - kanzlei - password: '' - - - name: rolf - groups: - - alle - - aulmann - - howe - - stahmann - - traine - - public - password: '4xNVNFXgP4' - - - name: sysadm - groups: - - a-jur - - advoware - - alle - - aulmann - - intern - - kanzlei - - stahmann - - traine - - public - password: 'Ax_GSHh5' - - - name: thomas - groups: - - advoware - - alle - - traine - password: '55-tho-mas-550' - - - name: Tresen - groups: - - a-jur - - advoware - - alle - - kanzlei - - howe - - stahmann - - traine - - public - password: 'maltzwo2' - - - name: wiebke - groups: - - alle - - wildvang - - public - password: '4xNVNFXgP4' - - - name: winadm - groups: - - a-jur - - advoware - - alle - - intern - - kanzlei - - public - password: 'Ax_GSHh5' - - - -base_home: /data/home - -remove_samba_users: - - name: howe-staff-1 - - name: gerhard - - name: laura - -#remove_samba_users: [] -#remove_samba_users: -# - name: evren - -samba_shares: - - - name: a-jur - comment: a-jur Dokumente - path: /data/samba/a-jur - group_valid_users: a-jur - group_write_list: a-jur - file_create_mask: !!str 664 - dir_create_mask: !!str 2775 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - - - name: kanzlei - comment: Kanzlei auf Fileserver - path: /data/samba/kanzlei - group_valid_users: kanzlei - group_write_list: kanzlei - file_create_mask: !!str 664 - dir_create_mask: !!str 2775 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - - - name: install - comment: Install auf Fileserver - path: /data/samba/no-backup-shares/install - group_valid_users: intern - group_write_list: intern - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: false - - - name: wildvang - comment: Traine auf Fileserver - path: /data/samba/Wildvang - group_valid_users: wildvang - group_write_list: wildvang - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - -# - name: aulmann -# comment: Aulmann auf Fileserver -# path: /data/samba/Aulmann -# group_valid_users: aulmann -# group_write_list: aulmann -# file_create_mask: !!str 660 -# dir_create_mask: !!str 2770 -# vfs_object_recycle: true -# recycle_path: '@Recycle' -# vfs_object_recycle_is_visible: true - -# - name: howe -# comment: Howe auf Fileserver -# path: /data/samba/Howe -# group_valid_users: howe -# group_write_list: howe -# file_create_mask: !!str 660 -# dir_create_mask: !!str 2770 -# vfs_object_recycle: true -# recycle_path: '@Recycle' -# vfs_object_recycle_is_visible: true - - - name: stahmann - comment: Stahmann auf Fileserver - path: /data/samba/Stahmann - group_valid_users: stahmann - group_write_list: stahmann - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - - - name: traine - comment: Traine auf Fileserver - path: /data/samba/Traine - group_valid_users: traine - group_write_list: traine - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - - - name: public - comment: Public auf Fileserver - path: /data/samba/public - group_valid_users: public - group_write_list: public - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - - - name: Advoware-Schriftverkehr - comment: Advoware Dokumente - path: /data/samba/Advoware-Schriftverkehr - group_valid_users: advoware - group_write_list: advoware - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - - - name: Advoware-Backup - comment: Advoware Dokumente - path: /data/samba/Advoware-Backup - group_valid_users: intern - group_write_list: intern - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: false - - - name: alle - comment: Alle auf Fileserver - path: /data/samba/Alle - group_valid_users: alle - group_write_list: alle - file_create_mask: !!str 660 - dir_create_mask: !!str 2770 - vfs_object_recycle: true - recycle_path: '@Recycle' - vfs_object_recycle_is_visible: true - -# - name: web -# comment: Web auf Fileserver -# path: /data/samba/Web -# group_valid_users: web -# group_write_list: web -# file_create_mask: !!str 660 -# dir_create_mask: !!str 2770 -# vfs_object_recycle: true -# recycle_path: '@Recycle' - - -# ============================== - - -# --- -# vars used by scripts/reset_root_passwd.yml -# --- - -root_user: - name: root - password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. diff --git a/host_vars/file-km.anw-km.netz.yml b/host_vars/file-km.anw-km.netz/file-km-common.yml similarity index 100% rename from host_vars/file-km.anw-km.netz.yml rename to host_vars/file-km.anw-km.netz/file-km-common.yml diff --git a/host_vars/formbricks-nd.oopen.de.yml b/host_vars/formbricks-nd.oopen.de/formbricks-nd-common.yml similarity index 100% rename from host_vars/formbricks-nd.oopen.de.yml rename to host_vars/formbricks-nd.oopen.de/formbricks-nd-common.yml diff --git a/host_vars/g.mx.oopen.de.yml b/host_vars/g.mx.oopen.de/g.mx-common.yml similarity index 100% rename from host_vars/g.mx.oopen.de.yml rename to host_vars/g.mx.oopen.de/g.mx-common.yml diff --git a/host_vars/ga-al-gw.oopen.de.yml b/host_vars/ga-al-gw.oopen.de/ga-al-gw-common.yml similarity index 100% rename from host_vars/ga-al-gw.oopen.de.yml rename to host_vars/ga-al-gw.oopen.de/ga-al-gw-common.yml diff --git a/host_vars/ga-al-kvm2.ga.netz.yml b/host_vars/ga-al-kvm2.ga.netz/ga-al-kvm2-common.yml similarity index 100% rename from host_vars/ga-al-kvm2.ga.netz.yml rename to host_vars/ga-al-kvm2.ga.netz/ga-al-kvm2-common.yml diff --git a/host_vars/ga-al-kvm3.ga.netz.yml b/host_vars/ga-al-kvm3.ga.netz/ga-al-kvm3-common.yml similarity index 100% rename from host_vars/ga-al-kvm3.ga.netz.yml rename to host_vars/ga-al-kvm3.ga.netz/ga-al-kvm3-common.yml diff --git a/host_vars/ga-al-relay.ga.netz.yml b/host_vars/ga-al-relay.ga.netz/ga-al-relay-common.yml similarity index 100% rename from host_vars/ga-al-relay.ga.netz.yml rename to host_vars/ga-al-relay.ga.netz/ga-al-relay-common.yml diff --git a/host_vars/ga-campus-gw-temp.ga.netz.yml b/host_vars/ga-campus-gw-temp.ga.netz/ga-campus-gw-temp-common.yml similarity index 100% rename from host_vars/ga-campus-gw-temp.ga.netz.yml rename to host_vars/ga-campus-gw-temp.ga.netz/ga-campus-gw-temp-common.yml diff --git a/host_vars/ga-gh-gw.oopen.de.yml b/host_vars/ga-gh-gw.oopen.de/ga-gh-gw-common.yml similarity index 100% rename from host_vars/ga-gh-gw.oopen.de.yml rename to host_vars/ga-gh-gw.oopen.de/ga-gh-gw-common.yml diff --git a/host_vars/ga-nh-gw.oopen.de.yml b/host_vars/ga-nh-gw.oopen.de/ga-nh-gw-common.yml similarity index 100% rename from host_vars/ga-nh-gw.oopen.de.yml rename to host_vars/ga-nh-gw.oopen.de/ga-nh-gw-common.yml diff --git a/host_vars/ga-st-gw-ersatz.ga.netz.yml b/host_vars/ga-st-gw-ersatz.ga.netz/ga-st-gw-ersatz-common.yml similarity index 100% rename from host_vars/ga-st-gw-ersatz.ga.netz.yml rename to host_vars/ga-st-gw-ersatz.ga.netz/ga-st-gw-ersatz-common.yml diff --git a/host_vars/ga-st-gw-neu.ga.netz.yml.00 b/host_vars/ga-st-gw-neu.ga.netz.yml.00 deleted file mode 100644 index f0b006d..0000000 --- a/host_vars/ga-st-gw-neu.ga.netz.yml.00 +++ /dev/null @@ -1,591 +0,0 @@ ---- -# --- -# vars used by roles/network_interfaces -# --- - - -# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted -network_manage_devices: True - -# Should the interfaces be reloaded after config change? -network_interface_reload: False - -network_interface_path: /etc/network/interfaces.d -network_interface_required_packages: - - vlan - - bridge-utils - - ifmetric - - ifupdown - - ifenslave - -network_interfaces: - - - device: eno1np0 - headline: eno1np0 - Temporary LAN network - auto: true - family: inet - method: static - address: 192.168.11.18 - netmask: 24 - - - device: enp129s0f2 - headline: enp129s0f2 - Uplink static line (radio) to Altenschlirf - auto: true - family: inet - method: static - address: 172.16.111.254 - netmask: 24 - up: - # - For management Antennas - - /sbin/ip link add link enp129s0f2 name enp129s0f2.111 type vlan id 111 - post-up: - # - Static routes to Altenschlirf (Router Ip-Address Altenschlirf: 172.16.111.253) - # - - # - Telefon Altenshlirf - - /sbin/ip route add 172.16.210.0/24 via 172.16.111.253 - # User Network Altenshlirf - - /sbin/ip route add 192.168.10.0/24 via 172.16.111.253 - # Management Network Altenschlirf - - /sbin/ip route add 10.10.10.0/24 via 172.16.111.253 - # WLan Router (Accesspoints) Altenshlirf - - /sbin/ip route add 10.122.1.0/24 via 172.16.111.253 - # # WLan Networks Altenshlirf - - /sbin/ip route add 10.123.0.0/16 via 172.16.111.253 - # DSL via Fritzbox Altenschlirf - - /sbin/ip route add 172.16.10.0/24 via 172.16.111.253 - # - WLAN Gemeinschaft Altenschlirf guest NET (Unifi routet Network) - - /sbin/ip route add 10.221.0.0/20 via 172.16.111.253 - # - WLAN Gemeinschaft Altenschlirf private NET (Unifi routet Network) - - /sbin/ip route add 10.231.0.0/20 via 172.16.111.253 - # VPN home Network Altenschlirf - # - - /sbin/ip route add 10.0.10.0/24 via 172.16.111.253 - # VPN 'gw-ckubu' Network Altenschlirf - # - - /sbin/ip route add 10.1.10.0/24 via 172.16.111.253 - # private networks 'ckubu' - # - # connections from private ckubu networks ist routed through VPN Altenschlirf (gw-ckubu), - # so we route them back to that gateway.. - - /sbin/ip route add 192.168.63.0/24 via 172.16.111.253 - - /sbin/ip route add 192.168.64.0/24 via 172.16.111.253 - - - - device: enp129s0f2.111 - headline: enp129s0f2.111 - network 10.10.111.0 (management antennas) - auto: true - family: inet - method: static - address: 10.10.111.254 - netmask: 24 - - - - device: enp1s0f0 - headline: enp1s0f0 - holds VLAN 211 device for Network Telefons Stockhausen - auto: false - family: inet - method: manual - up: - - /sbin/ip link add link enp1s0f0 name enp1s0f0.211 type vlan id 211 - - - - device: enp1s0f0.211 - headline: enp1s0f0.211 - Network Telefons Stockhausen - auto: true - family: inet - method: static - # Note: - # !! 172.16.211.254 is reserved for LANCom Router (DSL line teleefon). - # This LANCom Router IS NOT pngable !! - address: 172.16.211.1 - netmask: 24 - pre-up: - - /sbin/ifconfig enp1s0f0 up - - - - device: enp1s0f2 - headline: enp1s0f2 - Uplink DSL surf2 via (static) line to Fritz!Box 7490 (formaly Zyxel 6501) - auto: true - family: inet - method: static - address: 172.16.11.1 - netmask: 24 - gateway: 172.16.11.254 - - - - device: enp1s0f3 - headline: enp1s0f3 - Uplink DSL surf3 via (static) line to Fritz!Box 7490 - auto: true - family: inet - method: static - address: 172.16.13.1 - netmask: 24 - gateway: 172.16.13.254 - - - - device: enp1s0f1 - headline: enp1s0f1 - Uplink DSL surf1 via (static) line to Fritz!Box 7490 (Mailserver) - auto: true - family: inet - method: static - address: 172.16.12.1 - netmask: 24 - gateway: 172.16.12.254 - - - # ---------- - # Note: Install the 'ifenslave' package, necessary to enable bonding: - # - # apt-get install ifenslave - # ---------- - - device: bond0 - headline: bond0 - LAG (Link Aggregation) on devices enp129s0f0 and enp194s0f0 - auto: true - family: inet - method: static - address: 10.1.9.254 - netmask: 24 - bond: - slaves: enp129s0f0 enp194s0f0 - # Mode 4 (802.3ad) - # - # also possible here: - # - Mode 5: balance-tlb - # - Mode 6: balance-alb - mode: 4 - miimon: 100 - lacp-rate: 1 - ad-select: count - downdelay: 200 - updelay: 200 - post-up: - # VLAN 11 for management network Stockhausen/Schloss 10.10.11.0/24 - - /sbin/ip link add link bond0 name bond0.11 type vlan id 11 - # VLAN 78 for network Georgshaus 192.168.78.0/24 - - /sbin/ip link add link bond0 name bond0.78 type vlan id 78 - - - - device: bond0.11 - headline: bond0.11 - VLAN 11 on interface bond0 (Management Network Stockhausen) - auto: true - family: inet - method: static - address: 10.10.11.254 - netmask: 24 - - - - device: bond0.78 - headline: bond0.78 - VLAN 78 on interface bond0 (Georgshaus ?) - auto: true - family: inet - method: static - address: 192.168.78.254 - netmask: 24 - - - # ---------- - # Note: Install the 'ifenslave' package, necessary to enable bonding: - # - # apt-get install ifenslave - # ---------- - - device: bond1 - headline: bond1 - LAG (Link Aggregation) on devices enp129s0f1 and enp194s0f1 - Main Network Stockhausen - auto: true - family: inet - method: static - address: 192.168.11.254 - netmask: 24 - nameservers: - - 192.168.11.1 - - 192.168.10.3 - search: ga.netz ga.intra - bond: - slaves: enp129s0f1 enp194s0f1 - # Mode 4 (802.3ad) - # - # also possible here: - # - Mode 5: balance-tlb - # - Mode 6: balance-alb - mode: 4 - miimon: 100 - lacp-rate: 1 - ad-select: count - downdelay: 200 - updelay: 200 - post-up: - # VLAN 121 - for Ubiquiti UniFi Accesspoints - - /sbin/ip link add link bond1 name bond1.121 type vlan id 121 - # VLAN 121 - for Ubiquiti UniFi Accesspoints Guests - - /sbin/ip link add link bond1 name bond1.131 type vlan id 131 - # Route ??? - - /sbin/ip route add 10.11.16.0/24 via 192.168.11.6 - # Route to management network campus - - /sbin/ip route add 10.72.1.0/24 via 192.168.11.72 - # Route to LAN campus - - /sbin/ip route add 192.168.72.0/24 via 192.168.11.72 - # Route to WLAN campus - - /sbin/ip route add 192.168.73.0/24 via 192.168.11.72 - - - - device: bond1.121 - headline: bond1.121 - VLAN 121 on interface bond1 for Ubiquiti UniFi Accesspoints Guest NET - auto: true - family: inet - method: static - address: 10.121.15.254 - netmask: 20 - - - - device: bond1.131 - headline: bond1.131 - VLAN 131 on interface bond1 for Ubiquiti UniFi Accesspoints private NET - auto: true - family: inet - method: static - address: 10.131.15.254 - netmask: 20 - - - - device: bond1:ns - headline: bond1:ns - Alias IP on bond1 device for Nameservice - auto: true - family: inet - method: static - address: 192.168.11.1 - netmask: 32 - - - - device: bond1:1 - headline: bond1:1 - Alias IP on bond1 device for (depricated) Management Network - auto: true - family: inet - method: static - address: 10.10.9.254 - netmask: 24 - - - - device: bond1:ap - headline: bond1:ap - Alias IP on bond1 device for Network Accesspoints - auto: true - family: inet - method: static - address: 10.112.1.254 - netmask: 24 - post-up: - # - Wireless Networks routed through appropriate Accesspoints - # - - - /sbin/ip route add 10.113.1.0/24 via 10.112.1.1 - - /sbin/ip route add 10.113.2.0/24 via 10.112.1.2 - - /sbin/ip route add 10.113.3.0/24 via 10.112.1.3 - - /sbin/ip route add 10.113.4.0/24 via 10.112.1.4 - - /sbin/ip route add 10.113.5.0/24 via 10.112.1.5 - - /sbin/ip route add 10.113.6.0/24 via 10.112.1.6 - - /sbin/ip route add 10.113.7.0/24 via 10.112.1.7 - - /sbin/ip route add 10.113.8.0/24 via 10.112.1.8 - - /sbin/ip route add 10.113.9.0/24 via 10.112.1.9 - - /sbin/ip route add 10.113.10.0/24 via 10.112.1.10 - - /sbin/ip route add 10.113.11.0/24 via 10.112.1.11 - - /sbin/ip route add 10.113.12.0/24 via 10.112.1.12 - - /sbin/ip route add 10.113.13.0/24 via 10.112.1.13 - - /sbin/ip route add 10.113.14.0/24 via 10.112.1.14 - - /sbin/ip route add 10.113.15.0/24 via 10.112.1.15 - - - - device: bond1:ipmi - headline: bond1:ipmi - Alias IP on bond1 for IPMI Addresses Servr Stockhausen - auto: true - family: inet - method: static - address: 10.11.11.254 - netmask: 24 - - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - - -# --- -# vars used by roles/common/tasks/apt.yml -# --- - - -# --- -# 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: - - 127.0.0.1 - -# 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: - - ~. - - ga.netz - - ga.intra - -resolved_dnssec: false - -# dns.as250.net: 194.150.168.168 -# -resolved_fallback_nameserver: - - 192.168.10.1 - - -# --- -# vars used by roles/common/tasks/cron.yml -# --- - -cron_user_special_time_entries: - - - name: "Restart NTP service 'ntpsec'" - special_time: reboot - job: "sleep 15 ; /bin/systemctl restart ntpsec" - insertafter: PATH - - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - -insert_ssh_keypair_backup_server: false -ssh_keypair_backup_server: - - name: backup - backup_user: back - priv_key_src: root/.ssh/id_rsa.backup.oopen.de - priv_key_dest: /root/.ssh/id_rsa - pub_key_src: root/.ssh/id_rsa.backup.oopen.de.pub - pub_key_dest: /root/.ssh/id_rsa.pub - -insert_keypair_backup_client: true -ssh_keypair_backup_client: - - name: backup - priv_key_src: root/.ssh/id_ed25519.oopen-server - priv_key_dest: /root/.ssh/id_ed25519 - pub_key_src: root/.ssh/id_ed25519.oopen-server.pub - pub_key_dest: /root/.ssh/id_ed25519.pub - target: backup.oopen.de - -default_user: - - - name: chris - password: $y$j9T$rDrvWa/KInzTe601YYf9./$WjDlaItCrgX7gu4nCs481y8WLxiRaNJCC/MgFgKuzg3 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' - - - name: maadmin - password: $y$j9T$LCkYWvykWzrpFxIlmSUB01$e1ROfZxXAU53UdAwZAECzED4iV4LS02Q4IPQ2fycv51 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCQRRXy0+9D+mhLniRlUpZZ3kZdZcQKXBsGnlsFYaRi maadmin@ga-st-lsx1' - - - name: wadmin - password: $6$sLWIXKTW$i/STlSS0LijkrnGR/XMbaxJsEbrRdDYgqyCqIr.muLN5towes8yHDCXsyCYDjuaBNKPHXyFpr8lclg5DOm9OF1 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5GDIFA6/i6lzkr+EP/EZM9glrK0eSR0nmrEFgUJ4n8 wadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID17MN6fUg0D1dMSgVYIBpIy+sDBBmiaHmXRXU63TXJA wadmin@ga-st-li1303' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtK8/rxHL1MKX5AHrgAzUYu0kV+1iYCmknpTQ7F0ham wadmin@wolf-debtest' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcaDFxj0pYjOv/ohFVxVY2RKvy6ACZFPX9UkrUPHkbN wadmin@wolf-x1' - - - name: sysadm - user_id: 1050 - group_id: 1050 - group: sysadm - password: $y$j9T$awYUu9oRvV39ojITZOC7D1$czTh5HHIE32PXb0vl40ayAarm39txR4jaH1QzBscqfC - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCQRRXy0+9D+mhLniRlUpZZ3kZdZcQKXBsGnlsFYaRi maadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5GDIFA6/i6lzkr+EP/EZM9glrK0eSR0nmrEFgUJ4n8 wadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID17MN6fUg0D1dMSgVYIBpIy+sDBBmiaHmXRXU63TXJA wadmin@ga-st-li1303' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtK8/rxHL1MKX5AHrgAzUYu0kV+1iYCmknpTQ7F0ham wadmin@wolf-debtest' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcaDFxj0pYjOv/ohFVxVY2RKvy6ACZFPX9UkrUPHkbN wadmin@wolf-x1' - - - name: back - user_id: 1060 - group_id: 1060 - group: back - password: $y$j9T$wpg8hlvMpO4PAWSVdLoJq/$dgpQh4cEnbUOQkkZzKUM4S8XzNS/Md5gMmMuNTqec74 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - -sudo_users: - - chris - - sysadm - - maadmin - - wadmin - - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - -install_bind_packages: true - -bind9_gateway_acl: - - local-net: - name: local-net - entries: - - 127.0.0.0/8 - - 172.16.0.0/12 - - 192.168.0.0/16 - - 10.0.0.0/8 - - fc00::/7 - - fe80::/10 - - ::1/128 - - internaldns: - name: internaldns - entries: - - '# Nameserver Gateway Stockhausen' - - 192.168.11.1 - - '# Domain Controller Stockhausen' - - 192.168.10.3 - - '# Nameserver Gateway Altenschlirf' - - 192.168.10.1 - - '# Domain Controller Altenschlirf' - - 192.168.10.3 - - 192.168.10.6 - - 172.16.0.1 - - '# Nameserver Gateway Novalishaus' - - 192.168.81.1 - - 10.2.11.2 - - '# Nameserver wolle' - - 10.113.12.3 - - '# Postfix Mailserver' - - 192.168.11.2 - - '# Mail Relay System' - - 192.168.10.2 - -bind9_gateway_listen_on_v6: - - none - -bind9_gateway_listen_on: - - any - -#bind9_gateway_allow_transfer: {} -bind9_gateway_allow_transfer: - - internaldns - -bind9_transfer_source: !!str "192.168.11.1" -bind9_notify_source: !!str "192.168.11.1" - -#bind9_gateway_allow_query: {} -bind9_gateway_allow_query: - - local-net - -#bind9_gateway_allow_query_cache: {} -bind9_gateway_allow_query_cache: - - local-net - -bind9_gateway_recursion: !!str "yes" -#bind9_gateway_allow_recursion: {} -bind9_gateway_allow_recursion: - - local-net - - -# --- -# vars used by roles/common/tasks/git.yml -# --- - -git_firewall_repository: - name: ipt-gateway - repo: https://git.oopen.de/firewall/ipt-gateway - dest: /usr/local/src/ipt-gateway - -# ============================== - - -# --- -# vars used by scripts/reset_root_passwd.yml -# --- - -root_user: - name: root - password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. - diff --git a/host_vars/ga-st-gw-neu.ga.netz.yml.01 b/host_vars/ga-st-gw-neu.ga.netz.yml.01 deleted file mode 100644 index 48c0378..0000000 --- a/host_vars/ga-st-gw-neu.ga.netz.yml.01 +++ /dev/null @@ -1,592 +0,0 @@ ---- -# --- -# vars used by roles/network_interfaces -# --- - - -# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted -network_manage_devices: True - -# Should the interfaces be reloaded after config change? -network_interface_reload: False - -network_interface_path: /etc/network/interfaces.d -network_interface_required_packages: - - vlan - - bridge-utils - - ifmetric - - ifupdown - - ifenslave - -network_interfaces: - - - device: lan0 - headline: lan0 - Temporary LAN network - auto: false - family: inet - method: static - address: 192.168.11.18 - gateway: 192.168.11.254 - netmask: 24 - - - device: lan4 - headline: lan4 - Uplink static line (radio) to Altenschlirf - auto: true - family: inet - method: static - address: 172.16.111.254 - netmask: 24 - up: - # - For management Antennas - - /sbin/ip link add link lan4 name lan4.111 type vlan id 111 - post-up: - # - Static routes to Altenschlirf (Router Ip-Address Altenschlirf: 172.16.111.253) - # - - # - Telefon Altenshlirf - - /sbin/ip route add 172.16.210.0/24 via 172.16.111.253 - # User Network Altenshlirf - - /sbin/ip route add 192.168.10.0/24 via 172.16.111.253 - # Management Network Altenschlirf - - /sbin/ip route add 10.10.10.0/24 via 172.16.111.253 - # WLan Router (Accesspoints) Altenshlirf - - /sbin/ip route add 10.122.1.0/24 via 172.16.111.253 - # # WLan Networks Altenshlirf - - /sbin/ip route add 10.123.0.0/16 via 172.16.111.253 - # DSL via Fritzbox Altenschlirf - - /sbin/ip route add 172.16.10.0/24 via 172.16.111.253 - # - WLAN Gemeinschaft Altenschlirf guest NET (Unifi routet Network) - - /sbin/ip route add 10.221.0.0/20 via 172.16.111.253 - # - WLAN Gemeinschaft Altenschlirf private NET (Unifi routet Network) - - /sbin/ip route add 10.231.0.0/20 via 172.16.111.253 - # VPN home Network Altenschlirf - # - - /sbin/ip route add 10.0.10.0/24 via 172.16.111.253 - # VPN 'gw-ckubu' Network Altenschlirf - # - - /sbin/ip route add 10.1.10.0/24 via 172.16.111.253 - # private networks 'ckubu' - # - # connections from private ckubu networks ist routed through VPN Altenschlirf (gw-ckubu), - # so we route them back to that gateway.. - - /sbin/ip route add 192.168.63.0/24 via 172.16.111.253 - - /sbin/ip route add 192.168.64.0/24 via 172.16.111.253 - - - - device: lan4.111 - headline: lan4.111 - network 10.10.111.0 (management antennas) - auto: true - family: inet - method: static - address: 10.10.111.254 - netmask: 24 - - - - device: lan6 - headline: lan6 - holds VLAN 211 device for Network Telefons Stockhausen - auto: false - family: inet - method: manual - up: - - /sbin/ip link add link lan6 name lan6.211 type vlan id 211 - - - - device: lan6.211 - headline: lan6.211 - Network Telefons Stockhausen - auto: true - family: inet - method: static - # Note: - # !! 172.16.211.254 is reserved for LANCom Router (DSL line teleefon). - # This LANCom Router IS NOT pngable !! - address: 172.16.211.1 - netmask: 24 - pre-up: - - /sbin/ifconfig lan6 up - - - - device: lan8 - headline: lan8 - Uplink DSL surf2 via (static) line to Fritz!Box 7490 (formaly Zyxel 6501) - auto: true - family: inet - method: static - address: 172.16.11.1 - netmask: 24 - gateway: 172.16.11.254 - - - - device: lan9 - headline: lan9 - Uplink DSL surf3 via (static) line to Fritz!Box 7490 - auto: true - family: inet - method: static - address: 172.16.13.1 - netmask: 24 - gateway: 172.16.13.254 - - - - device: lan7 - headline: lan7 - Uplink DSL surf1 via (static) line to Fritz!Box 7490 (Mailserver) - auto: true - family: inet - method: static - address: 172.16.12.1 - netmask: 24 - gateway: 172.16.12.254 - - - # ---------- - # Note: Install the 'ifenslave' package, necessary to enable bonding: - # - # apt-get install ifenslave - # ---------- - - device: bond0 - headline: bond0 - LAG (Link Aggregation) on devices lan2 and lan10 - auto: true - family: inet - method: static - address: 10.1.9.254 - netmask: 24 - bond: - slaves: lan2 lan10 - # Mode 4 (802.3ad) - # - # also possible here: - # - Mode 5: balance-tlb - # - Mode 6: balance-alb - mode: 4 - miimon: 100 - lacp-rate: 1 - ad-select: count - downdelay: 200 - updelay: 200 - post-up: - # VLAN 11 for management network Stockhausen/Schloss 10.10.11.0/24 - - /sbin/ip link add link bond0 name bond0.11 type vlan id 11 - # VLAN 78 for network Georgshaus 192.168.78.0/24 - - /sbin/ip link add link bond0 name bond0.78 type vlan id 78 - - - - device: bond0.11 - headline: bond0.11 - VLAN 11 on interface bond0 (Management Network Stockhausen) - auto: true - family: inet - method: static - address: 10.10.11.254 - netmask: 24 - - - - device: bond0.78 - headline: bond0.78 - VLAN 78 on interface bond0 (Georgshaus ?) - auto: true - family: inet - method: static - address: 192.168.78.254 - netmask: 24 - - - # ---------- - # Note: Install the 'ifenslave' package, necessary to enable bonding: - # - # apt-get install ifenslave - # ---------- - - device: bond1 - headline: bond1 - LAG (Link Aggregation) on devices lan3 and lan11 - Main Network Stockhausen - auto: true - family: inet - method: static - address: 192.168.11.254 - netmask: 24 - nameservers: - - 192.168.11.1 - - 192.168.10.3 - search: ga.netz ga.intra - bond: - slaves: lan3 lan11 - # Mode 4 (802.3ad) - # - # also possible here: - # - Mode 5: balance-tlb - # - Mode 6: balance-alb - mode: 4 - miimon: 100 - lacp-rate: 1 - ad-select: count - downdelay: 200 - updelay: 200 - post-up: - # VLAN 121 - for Ubiquiti UniFi Accesspoints - - /sbin/ip link add link bond1 name bond1.121 type vlan id 121 - # VLAN 121 - for Ubiquiti UniFi Accesspoints Guests - - /sbin/ip link add link bond1 name bond1.131 type vlan id 131 - # Route ??? - - /sbin/ip route add 10.11.16.0/24 via 192.168.11.6 - # Route to management network campus - - /sbin/ip route add 10.72.1.0/24 via 192.168.11.72 - # Route to LAN campus - - /sbin/ip route add 192.168.72.0/24 via 192.168.11.72 - # Route to WLAN campus - - /sbin/ip route add 192.168.73.0/24 via 192.168.11.72 - - - - device: bond1.121 - headline: bond1.121 - VLAN 121 on interface bond1 for Ubiquiti UniFi Accesspoints Guest NET - auto: true - family: inet - method: static - address: 10.121.15.254 - netmask: 20 - - - - device: bond1.131 - headline: bond1.131 - VLAN 131 on interface bond1 for Ubiquiti UniFi Accesspoints private NET - auto: true - family: inet - method: static - address: 10.131.15.254 - netmask: 20 - - - - device: bond1:ns - headline: bond1:ns - Alias IP on bond1 device for Nameservice - auto: true - family: inet - method: static - address: 192.168.11.1 - netmask: 32 - - - - device: bond1:1 - headline: bond1:1 - Alias IP on bond1 device for (depricated) Management Network - auto: true - family: inet - method: static - address: 10.10.9.254 - netmask: 24 - - - - device: bond1:ap - headline: bond1:ap - Alias IP on bond1 device for Network Accesspoints - auto: true - family: inet - method: static - address: 10.112.1.254 - netmask: 24 - post-up: - # - Wireless Networks routed through appropriate Accesspoints - # - - - /sbin/ip route add 10.113.1.0/24 via 10.112.1.1 - - /sbin/ip route add 10.113.2.0/24 via 10.112.1.2 - - /sbin/ip route add 10.113.3.0/24 via 10.112.1.3 - - /sbin/ip route add 10.113.4.0/24 via 10.112.1.4 - - /sbin/ip route add 10.113.5.0/24 via 10.112.1.5 - - /sbin/ip route add 10.113.6.0/24 via 10.112.1.6 - - /sbin/ip route add 10.113.7.0/24 via 10.112.1.7 - - /sbin/ip route add 10.113.8.0/24 via 10.112.1.8 - - /sbin/ip route add 10.113.9.0/24 via 10.112.1.9 - - /sbin/ip route add 10.113.10.0/24 via 10.112.1.10 - - /sbin/ip route add 10.113.11.0/24 via 10.112.1.11 - - /sbin/ip route add 10.113.12.0/24 via 10.112.1.12 - - /sbin/ip route add 10.113.13.0/24 via 10.112.1.13 - - /sbin/ip route add 10.113.14.0/24 via 10.112.1.14 - - /sbin/ip route add 10.113.15.0/24 via 10.112.1.15 - - - - device: bond1:ipmi - headline: bond1:ipmi - Alias IP on bond1 for IPMI Addresses Servr Stockhausen - auto: true - family: inet - method: static - address: 10.11.11.254 - netmask: 24 - - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - - -# --- -# vars used by roles/common/tasks/apt.yml -# --- - - -# --- -# 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: - - 127.0.0.1 - -# 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: - - ~. - - ga.netz - - ga.intra - -resolved_dnssec: false - -# dns.as250.net: 194.150.168.168 -# -resolved_fallback_nameserver: - - 192.168.10.1 - - -# --- -# vars used by roles/common/tasks/cron.yml -# --- - -cron_user_special_time_entries: - - - name: "Restart NTP service 'ntpsec'" - special_time: reboot - job: "sleep 15 ; /bin/systemctl restart ntpsec" - insertafter: PATH - - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - -insert_ssh_keypair_backup_server: false -ssh_keypair_backup_server: - - name: backup - backup_user: back - priv_key_src: root/.ssh/id_rsa.backup.oopen.de - priv_key_dest: /root/.ssh/id_rsa - pub_key_src: root/.ssh/id_rsa.backup.oopen.de.pub - pub_key_dest: /root/.ssh/id_rsa.pub - -insert_keypair_backup_client: true -ssh_keypair_backup_client: - - name: backup - priv_key_src: root/.ssh/id_ed25519.oopen-server - priv_key_dest: /root/.ssh/id_ed25519 - pub_key_src: root/.ssh/id_ed25519.oopen-server.pub - pub_key_dest: /root/.ssh/id_ed25519.pub - target: backup.oopen.de - -default_user: - - - name: chris - password: $y$j9T$rDrvWa/KInzTe601YYf9./$WjDlaItCrgX7gu4nCs481y8WLxiRaNJCC/MgFgKuzg3 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' - - - name: maadmin - password: $y$j9T$LCkYWvykWzrpFxIlmSUB01$e1ROfZxXAU53UdAwZAECzED4iV4LS02Q4IPQ2fycv51 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCQRRXy0+9D+mhLniRlUpZZ3kZdZcQKXBsGnlsFYaRi maadmin@ga-st-lsx1' - - - name: wadmin - password: $6$sLWIXKTW$i/STlSS0LijkrnGR/XMbaxJsEbrRdDYgqyCqIr.muLN5towes8yHDCXsyCYDjuaBNKPHXyFpr8lclg5DOm9OF1 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5GDIFA6/i6lzkr+EP/EZM9glrK0eSR0nmrEFgUJ4n8 wadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID17MN6fUg0D1dMSgVYIBpIy+sDBBmiaHmXRXU63TXJA wadmin@ga-st-li1303' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtK8/rxHL1MKX5AHrgAzUYu0kV+1iYCmknpTQ7F0ham wadmin@wolf-debtest' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcaDFxj0pYjOv/ohFVxVY2RKvy6ACZFPX9UkrUPHkbN wadmin@wolf-x1' - - - name: sysadm - user_id: 1050 - group_id: 1050 - group: sysadm - password: $y$j9T$awYUu9oRvV39ojITZOC7D1$czTh5HHIE32PXb0vl40ayAarm39txR4jaH1QzBscqfC - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCQRRXy0+9D+mhLniRlUpZZ3kZdZcQKXBsGnlsFYaRi maadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5GDIFA6/i6lzkr+EP/EZM9glrK0eSR0nmrEFgUJ4n8 wadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID17MN6fUg0D1dMSgVYIBpIy+sDBBmiaHmXRXU63TXJA wadmin@ga-st-li1303' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtK8/rxHL1MKX5AHrgAzUYu0kV+1iYCmknpTQ7F0ham wadmin@wolf-debtest' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcaDFxj0pYjOv/ohFVxVY2RKvy6ACZFPX9UkrUPHkbN wadmin@wolf-x1' - - - name: back - user_id: 1060 - group_id: 1060 - group: back - password: $y$j9T$wpg8hlvMpO4PAWSVdLoJq/$dgpQh4cEnbUOQkkZzKUM4S8XzNS/Md5gMmMuNTqec74 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - -sudo_users: - - chris - - sysadm - - maadmin - - wadmin - - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - -install_bind_packages: true - -bind9_gateway_acl: - - local-net: - name: local-net - entries: - - 127.0.0.0/8 - - 172.16.0.0/12 - - 192.168.0.0/16 - - 10.0.0.0/8 - - fc00::/7 - - fe80::/10 - - ::1/128 - - internaldns: - name: internaldns - entries: - - '# Nameserver Gateway Stockhausen' - - 192.168.11.1 - - '# Domain Controller Stockhausen' - - 192.168.10.3 - - '# Nameserver Gateway Altenschlirf' - - 192.168.10.1 - - '# Domain Controller Altenschlirf' - - 192.168.10.3 - - 192.168.10.6 - - 172.16.0.1 - - '# Nameserver Gateway Novalishaus' - - 192.168.81.1 - - 10.2.11.2 - - '# Nameserver wolle' - - 10.113.12.3 - - '# Postfix Mailserver' - - 192.168.11.2 - - '# Mail Relay System' - - 192.168.10.2 - -bind9_gateway_listen_on_v6: - - none - -bind9_gateway_listen_on: - - any - -#bind9_gateway_allow_transfer: {} -bind9_gateway_allow_transfer: - - internaldns - -bind9_transfer_source: !!str "192.168.11.1" -bind9_notify_source: !!str "192.168.11.1" - -#bind9_gateway_allow_query: {} -bind9_gateway_allow_query: - - local-net - -#bind9_gateway_allow_query_cache: {} -bind9_gateway_allow_query_cache: - - local-net - -bind9_gateway_recursion: !!str "yes" -#bind9_gateway_allow_recursion: {} -bind9_gateway_allow_recursion: - - local-net - - -# --- -# vars used by roles/common/tasks/git.yml -# --- - -git_firewall_repository: - name: ipt-gateway - repo: https://git.oopen.de/firewall/ipt-gateway - dest: /usr/local/src/ipt-gateway - -# ============================== - - -# --- -# vars used by scripts/reset_root_passwd.yml -# --- - -root_user: - name: root - password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. - diff --git a/host_vars/ga-st-gw.ga.netz.yml.00 b/host_vars/ga-st-gw.ga.netz.yml.00 deleted file mode 100644 index 67745f7..0000000 --- a/host_vars/ga-st-gw.ga.netz.yml.00 +++ /dev/null @@ -1,583 +0,0 @@ ---- -# --- -# vars used by roles/network_interfaces -# --- - - -# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted -network_manage_devices: True - -# Should the interfaces be reloaded after config change? -network_interface_reload: False - -network_interface_path: /etc/network/interfaces.d -network_interface_required_packages: - - vlan - - bridge-utils - - ifmetric - - ifupdown - - ifenslave - -network_interfaces: - - - device: eth2 - headline: eth2 - Uplink static line (radio) to Altenschlirf - auto: true - family: inet - method: static - address: 172.16.111.254 - netmask: 24 - up: - # - For management Antennas - - /sbin/ip link add link eth2 name eth2.111 type vlan id 111 - post-up: - # - Static routes to Altenschlirf (Router Ip-Address Altenschlirf: 172.16.111.253) - # - - # - Telefon Altenshlirf - - /sbin/ip route add 172.16.210.0/24 via 172.16.111.253 - # User Network Altenshlirf - - /sbin/ip route add 192.168.10.0/24 via 172.16.111.253 - # Management Network Altenschlirf - - /sbin/ip route add 10.10.10.0/24 via 172.16.111.253 - # WLan Router (Accesspoints) Altenshlirf - - /sbin/ip route add 10.122.1.0/24 via 172.16.111.253 - # # WLan Networks Altenshlirf - - /sbin/ip route add 10.123.0.0/16 via 172.16.111.253 - # DSL via Fritzbox Altenschlirf - - /sbin/ip route add 172.16.10.0/24 via 172.16.111.253 - # - WLAN Gemeinschaft Altenschlirf guest NET (Unifi routet Network) - - /sbin/ip route add 10.221.0.0/20 via 172.16.111.253 - # - WLAN Gemeinschaft Altenschlirf private NET (Unifi routet Network) - - /sbin/ip route add 10.231.0.0/20 via 172.16.111.253 - # VPN home Network Altenschlirf - # - - /sbin/ip route add 10.0.10.0/24 via 172.16.111.253 - # VPN 'gw-ckubu' Network Altenschlirf - # - - /sbin/ip route add 10.1.10.0/24 via 172.16.111.253 - # private networks 'ckubu' - # - # connections from private ckubu networks ist routed through VPN Altenschlirf (gw-ckubu), - # so we route them back to that gateway.. - - /sbin/ip route add 192.168.63.0/24 via 172.16.111.253 - - /sbin/ip route add 192.168.64.0/24 via 172.16.111.253 - - - - device: eth2.111 - headline: eth2.111 - network 10.10.111.0 (management antennas) - auto: true - family: inet - method: static - address: 10.10.111.254 - netmask: 24 - - - - device: eth8 - headline: eth8 - holds VLAN 211 device for Network Telefons Stockhausen - auto: false - family: inet - method: manual - up: - - /sbin/ip link add link eth8 name eth8.211 type vlan id 211 - - - - device: eth8.211 - headline: eth8.211 - Network Telefons Stockhausen - auto: true - family: inet - method: static - # Note: - # !! 172.16.211.254 is reserved for LANCom Router (DSL line teleefon). - # This LANCom Router IS NOT pngable !! - address: 172.16.211.1 - netmask: 24 - pre-up: - - /sbin/ifconfig eth8 up - - - - device: eth9 - headline: eth9 - Uplink DSL surf2 via (static) line to Fritz!Box 7490 (formaly Zyxel 6501) - auto: true - family: inet - method: static - address: 172.16.11.1 - netmask: 24 - gateway: 172.16.11.254 - - - - device: eth10 - headline: eth10 - Uplink DSL surf3 via (static) line to Fritz!Box 7490 - auto: true - family: inet - method: static - address: 172.16.13.1 - netmask: 24 - gateway: 172.16.13.254 - - - - device: eth11 - headline: eth11 - Uplink DSL surf1 via (static) line to Fritz!Box 7490 (Mailserver) - auto: true - family: inet - method: static - address: 172.16.12.1 - netmask: 24 - gateway: 172.16.12.254 - - - # ---------- - # Note: Install the 'ifenslave' package, necessary to enable bonding: - # - # apt-get install ifenslave - # ---------- - - device: bond0 - headline: bond0 - LAG (Link Aggregation) on devices eth0 and eth4 - auto: true - family: inet - method: static - address: 10.1.9.254 - netmask: 24 - bond: - slaves: eth0 eth4 - # Mode 4 (802.3ad) - # - # also possible here: - # - Mode 5: balance-tlb - # - Mode 6: balance-alb - mode: 4 - miimon: 100 - lacp-rate: 1 - ad-select: count - downdelay: 200 - updelay: 200 - post-up: - # VLAN 11 for management network Stockhausen/Schloss 10.10.11.0/24 - - /sbin/ip link add link bond0 name bond0.11 type vlan id 11 - # VLAN 78 for network Georgshaus 192.168.78.0/24 - - /sbin/ip link add link bond0 name bond0.78 type vlan id 78 - - - - device: bond0.11 - headline: bond0.11 - VLAN 11 on interface bond0 (Management Network Stockhausen) - auto: true - family: inet - method: static - address: 10.10.11.254 - netmask: 24 - - - - device: bond0.78 - headline: bond0.78 - VLAN 78 on interface bond0 (Georgshaus ?) - auto: true - family: inet - method: static - address: 192.168.78.254 - netmask: 24 - - - # ---------- - # Note: Install the 'ifenslave' package, necessary to enable bonding: - # - # apt-get install ifenslave - # ---------- - - device: bond1 - headline: bond1 - LAG (Link Aggregation) on devices eth3 and eth5 - Main Network Stockhausen - auto: true - family: inet - method: static - address: 192.168.11.254 - netmask: 24 - nameservers: - - 192.168.11.1 - - 192.168.10.3 - search: ga.netz ga.intra - bond: - slaves: eth3 eth5 - # Mode 4 (802.3ad) - # - # also possible here: - # - Mode 5: balance-tlb - # - Mode 6: balance-alb - mode: 4 - miimon: 100 - lacp-rate: 1 - ad-select: count - downdelay: 200 - updelay: 200 - post-up: - # VLAN 121 - for Ubiquiti UniFi Accesspoints - - /sbin/ip link add link bond1 name bond1.121 type vlan id 121 - # VLAN 121 - for Ubiquiti UniFi Accesspoints Guests - - /sbin/ip link add link bond1 name bond1.131 type vlan id 131 - # Route ??? - - /sbin/ip route add 10.11.16.0/24 via 192.168.11.6 - # Route to management network campus - - /sbin/ip route add 10.72.1.0/24 via 192.168.11.72 - # Route to LAN campus - - /sbin/ip route add 192.168.72.0/24 via 192.168.11.72 - # Route to WLAN campus - - /sbin/ip route add 192.168.73.0/24 via 192.168.11.72 - - - - device: bond1.121 - headline: bond1.121 - VLAN 121 on interface bond1 for Ubiquiti UniFi Accesspoints Guest NET - auto: true - family: inet - method: static - address: 10.121.15.254 - netmask: 20 - - - - device: bond1.131 - headline: bond1.131 - VLAN 131 on interface bond1 for Ubiquiti UniFi Accesspoints private NET - auto: true - family: inet - method: static - address: 10.131.15.254 - netmask: 20 - - - - device: bond1:ns - headline: bond1:ns - Alias IP on bond1 device for Nameservice - auto: true - family: inet - method: static - address: 192.168.11.1 - netmask: 32 - - - - device: bond1:1 - headline: bond1:1 - Alias IP on bond1 device for (depricated) Management Network - auto: true - family: inet - method: static - address: 10.10.9.254 - netmask: 24 - - - - device: bond1:ap - headline: bond1:ap - Alias IP on bond1 device for Network Accesspoints - auto: true - family: inet - method: static - address: 10.112.1.254 - netmask: 24 - post-up: - # - Wireless Networks routed through appropriate Accesspoints - # - - - /sbin/ip route add 10.113.1.0/24 via 10.112.1.1 - - /sbin/ip route add 10.113.2.0/24 via 10.112.1.2 - - /sbin/ip route add 10.113.3.0/24 via 10.112.1.3 - - /sbin/ip route add 10.113.4.0/24 via 10.112.1.4 - - /sbin/ip route add 10.113.5.0/24 via 10.112.1.5 - - /sbin/ip route add 10.113.6.0/24 via 10.112.1.6 - - /sbin/ip route add 10.113.7.0/24 via 10.112.1.7 - - /sbin/ip route add 10.113.8.0/24 via 10.112.1.8 - - /sbin/ip route add 10.113.9.0/24 via 10.112.1.9 - - /sbin/ip route add 10.113.10.0/24 via 10.112.1.10 - - /sbin/ip route add 10.113.11.0/24 via 10.112.1.11 - - /sbin/ip route add 10.113.12.0/24 via 10.112.1.12 - - /sbin/ip route add 10.113.13.0/24 via 10.112.1.13 - - /sbin/ip route add 10.113.14.0/24 via 10.112.1.14 - - /sbin/ip route add 10.113.15.0/24 via 10.112.1.15 - - - - device: bond1:ipmi - headline: bond1:ipmi - Alias IP on bond1 for IPMI Addresses Servr Stockhausen - auto: true - family: inet - method: static - address: 10.11.11.254 - netmask: 24 - - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - - -# --- -# vars used by roles/common/tasks/apt.yml -# --- - - -# --- -# 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: - - 127.0.0.1 - -# 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: - - ~. - - ga.netz - - ga.intra - -resolved_dnssec: false - -# dns.as250.net: 194.150.168.168 -# -resolved_fallback_nameserver: - - 192.168.10.1 - - -# --- -# vars used by roles/common/tasks/cron.yml -# --- - -cron_user_special_time_entries: - - - name: "Restart NTP service 'ntpsec'" - special_time: reboot - job: "sleep 15 ; /bin/systemctl restart ntpsec" - insertafter: PATH - - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - -insert_ssh_keypair_backup_server: false -ssh_keypair_backup_server: - - name: backup - backup_user: back - priv_key_src: root/.ssh/id_rsa.backup.oopen.de - priv_key_dest: /root/.ssh/id_rsa - pub_key_src: root/.ssh/id_rsa.backup.oopen.de.pub - pub_key_dest: /root/.ssh/id_rsa.pub - -insert_keypair_backup_client: true -ssh_keypair_backup_client: - - name: backup - priv_key_src: root/.ssh/id_ed25519.oopen-server - priv_key_dest: /root/.ssh/id_ed25519 - pub_key_src: root/.ssh/id_ed25519.oopen-server.pub - pub_key_dest: /root/.ssh/id_ed25519.pub - target: backup.oopen.de - -default_user: - - - name: chris - password: $y$j9T$rDrvWa/KInzTe601YYf9./$WjDlaItCrgX7gu4nCs481y8WLxiRaNJCC/MgFgKuzg3 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' - - - name: maadmin - password: $y$j9T$LCkYWvykWzrpFxIlmSUB01$e1ROfZxXAU53UdAwZAECzED4iV4LS02Q4IPQ2fycv51 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCQRRXy0+9D+mhLniRlUpZZ3kZdZcQKXBsGnlsFYaRi maadmin@ga-st-lsx1' - - - name: wadmin - password: $6$sLWIXKTW$i/STlSS0LijkrnGR/XMbaxJsEbrRdDYgqyCqIr.muLN5towes8yHDCXsyCYDjuaBNKPHXyFpr8lclg5DOm9OF1 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5GDIFA6/i6lzkr+EP/EZM9glrK0eSR0nmrEFgUJ4n8 wadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID17MN6fUg0D1dMSgVYIBpIy+sDBBmiaHmXRXU63TXJA wadmin@ga-st-li1303' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtK8/rxHL1MKX5AHrgAzUYu0kV+1iYCmknpTQ7F0ham wadmin@wolf-debtest' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcaDFxj0pYjOv/ohFVxVY2RKvy6ACZFPX9UkrUPHkbN wadmin@wolf-x1' - - - name: sysadm - user_id: 1050 - group_id: 1050 - group: sysadm - password: $y$j9T$awYUu9oRvV39ojITZOC7D1$czTh5HHIE32PXb0vl40ayAarm39txR4jaH1QzBscqfC - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQHMUKlDh2ufno5pZOhUY5xFljC1R5zQ/GjOHDkS58D root@sol' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHCQRRXy0+9D+mhLniRlUpZZ3kZdZcQKXBsGnlsFYaRi maadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5GDIFA6/i6lzkr+EP/EZM9glrK0eSR0nmrEFgUJ4n8 wadmin@ga-st-lsx1' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID17MN6fUg0D1dMSgVYIBpIy+sDBBmiaHmXRXU63TXJA wadmin@ga-st-li1303' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtK8/rxHL1MKX5AHrgAzUYu0kV+1iYCmknpTQ7F0ham wadmin@wolf-debtest' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcaDFxj0pYjOv/ohFVxVY2RKvy6ACZFPX9UkrUPHkbN wadmin@wolf-x1' - - - name: back - user_id: 1060 - group_id: 1060 - group: back - password: $y$j9T$wpg8hlvMpO4PAWSVdLoJq/$dgpQh4cEnbUOQkkZzKUM4S8XzNS/Md5gMmMuNTqec74 - shell: /bin/bash - ssh_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO90culn3sicU2chTHn40ytcTay0nUIHap0uF/5fVM6P chris@sol' - -sudo_users: - - chris - - sysadm - - maadmin - - wadmin - - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - -install_bind_packages: true - -bind9_gateway_acl: - - local-net: - name: local-net - entries: - - 127.0.0.0/8 - - 172.16.0.0/12 - - 192.168.0.0/16 - - 10.0.0.0/8 - - fc00::/7 - - fe80::/10 - - ::1/128 - - internaldns: - name: internaldns - entries: - - '# Nameserver Gateway Stockhausen' - - 192.168.11.1 - - '# Domain Controller Stockhausen' - - 192.168.10.3 - - '# Nameserver Gateway Altenschlirf' - - 192.168.10.1 - - '# Domain Controller Altenschlirf' - - 192.168.10.3 - - 192.168.10.6 - - 172.16.0.1 - - '# Nameserver Gateway Novalishaus' - - 192.168.81.1 - - 10.2.11.2 - - '# Nameserver wolle' - - 10.113.12.3 - - '# Postfix Mailserver' - - 192.168.11.2 - - '# Mail Relay System' - - 192.168.10.2 - -bind9_gateway_listen_on_v6: - - none - -bind9_gateway_listen_on: - - any - -#bind9_gateway_allow_transfer: {} -bind9_gateway_allow_transfer: - - internaldns - -bind9_transfer_source: !!str "192.168.11.1" -bind9_notify_source: !!str "192.168.11.1" - -#bind9_gateway_allow_query: {} -bind9_gateway_allow_query: - - local-net - -#bind9_gateway_allow_query_cache: {} -bind9_gateway_allow_query_cache: - - local-net - -bind9_gateway_recursion: !!str "yes" -#bind9_gateway_allow_recursion: {} -bind9_gateway_allow_recursion: - - local-net - - -# --- -# vars used by roles/common/tasks/git.yml -# --- - -git_firewall_repository: - name: ipt-gateway - repo: https://git.oopen.de/firewall/ipt-gateway - dest: /usr/local/src/ipt-gateway - -# ============================== - - -# --- -# vars used by scripts/reset_root_passwd.yml -# --- - -root_user: - name: root - password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. - diff --git a/host_vars/ga-st-gw.ga.netz.yml b/host_vars/ga-st-gw.ga.netz/ga-st-gw-common.yml similarity index 100% rename from host_vars/ga-st-gw.ga.netz.yml rename to host_vars/ga-st-gw.ga.netz/ga-st-gw-common.yml diff --git a/host_vars/ga-st-kvm1.ga.netz.yml b/host_vars/ga-st-kvm1.ga.netz/ga-st-kvm1-common.yml similarity index 100% rename from host_vars/ga-st-kvm1.ga.netz.yml rename to host_vars/ga-st-kvm1.ga.netz/ga-st-kvm1-common.yml diff --git a/host_vars/ga-st-kvm5.ga.netz.yml b/host_vars/ga-st-kvm5.ga.netz/ga-st-kvm5-common.yml similarity index 100% rename from host_vars/ga-st-kvm5.ga.netz.yml rename to host_vars/ga-st-kvm5.ga.netz/ga-st-kvm5-common.yml diff --git a/host_vars/ga-st-lxc1.ga.netz.yml b/host_vars/ga-st-lxc1.ga.netz/ga-st-lxc1-common.yml similarity index 100% rename from host_vars/ga-st-lxc1.ga.netz.yml rename to host_vars/ga-st-lxc1.ga.netz/ga-st-lxc1-common.yml diff --git a/host_vars/ga-st-mail.ga.netz.yml b/host_vars/ga-st-mail.ga.netz/ga-st-mail-common.yml similarity index 100% rename from host_vars/ga-st-mail.ga.netz.yml rename to host_vars/ga-st-mail.ga.netz/ga-st-mail-common.yml diff --git a/host_vars/ga-st-mm.ga.netz.yml b/host_vars/ga-st-mm.ga.netz/ga-st-mm-common.yml similarity index 100% rename from host_vars/ga-st-mm.ga.netz.yml rename to host_vars/ga-st-mm.ga.netz/ga-st-mm-common.yml diff --git a/host_vars/ga-st-services.ga.netz.yml b/host_vars/ga-st-services.ga.netz/ga-st-services-common.yml similarity index 100% rename from host_vars/ga-st-services.ga.netz.yml rename to host_vars/ga-st-services.ga.netz/ga-st-services-common.yml diff --git a/host_vars/git.oopen.de.yml b/host_vars/git.oopen.de/git-common.yml similarity index 100% rename from host_vars/git.oopen.de.yml rename to host_vars/git.oopen.de/git-common.yml diff --git a/host_vars/git.warenform.de.yml b/host_vars/git.warenform.de/git-common.yml similarity index 100% rename from host_vars/git.warenform.de.yml rename to host_vars/git.warenform.de/git-common.yml diff --git a/host_vars/gitea.so36.net.yml b/host_vars/gitea.so36.net/gitea-common.yml similarity index 100% rename from host_vars/gitea.so36.net.yml rename to host_vars/gitea.so36.net/gitea-common.yml diff --git a/host_vars/gw-123.oopen.de.yml b/host_vars/gw-123.oopen.de/gw-123-common.yml similarity index 100% rename from host_vars/gw-123.oopen.de.yml rename to host_vars/gw-123.oopen.de/gw-123-common.yml diff --git a/host_vars/gw-ah.oopen.de.yml b/host_vars/gw-ah.oopen.de/gw-ah-common.yml similarity index 100% rename from host_vars/gw-ah.oopen.de.yml rename to host_vars/gw-ah.oopen.de/gw-ah-common.yml diff --git a/host_vars/gw-ak.oopen.de.yml b/host_vars/gw-ak.oopen.de/gw-ak-common.yml similarity index 100% rename from host_vars/gw-ak.oopen.de.yml rename to host_vars/gw-ak.oopen.de/gw-ak-common.yml diff --git a/host_vars/gw-akb.oopen.de.yml b/host_vars/gw-akb.oopen.de/gw-akb-common.yml similarity index 100% rename from host_vars/gw-akb.oopen.de.yml rename to host_vars/gw-akb.oopen.de/gw-akb-common.yml diff --git a/host_vars/gw-b3.oopen.de.yml b/host_vars/gw-b3.oopen.de/gw-b3-common.yml similarity index 100% rename from host_vars/gw-b3.oopen.de.yml rename to host_vars/gw-b3.oopen.de/gw-b3-common.yml diff --git a/host_vars/gw-blkr.oopen.de.yml b/host_vars/gw-blkr.oopen.de/gw-blkr-common.yml similarity index 100% rename from host_vars/gw-blkr.oopen.de.yml rename to host_vars/gw-blkr.oopen.de/gw-blkr-common.yml diff --git a/host_vars/gw-campus.oopen.de.yml b/host_vars/gw-campus.oopen.de/gw-campus-common.yml similarity index 100% rename from host_vars/gw-campus.oopen.de.yml rename to host_vars/gw-campus.oopen.de/gw-campus-common.yml diff --git a/host_vars/gw-ckubu.local.netz.yml b/host_vars/gw-ckubu.local.netz/gw-ckubu-common.yml similarity index 100% rename from host_vars/gw-ckubu.local.netz.yml rename to host_vars/gw-ckubu.local.netz/gw-ckubu-common.yml diff --git a/host_vars/gw-d11.oopen.de.yml b/host_vars/gw-d11.oopen.de/gw-d11-common.yml similarity index 100% rename from host_vars/gw-d11.oopen.de.yml rename to host_vars/gw-d11.oopen.de/gw-d11-common.yml diff --git a/host_vars/gw-dissens.oopen.de.yml b/host_vars/gw-dissens.oopen.de/gw-dissens-common.yml similarity index 100% rename from host_vars/gw-dissens.oopen.de.yml rename to host_vars/gw-dissens.oopen.de/gw-dissens-common.yml diff --git a/host_vars/gw-ebs.oopen.de.yml b/host_vars/gw-ebs.oopen.de/gw-ebs-common.yml similarity index 100% rename from host_vars/gw-ebs.oopen.de.yml rename to host_vars/gw-ebs.oopen.de/gw-ebs-common.yml diff --git a/host_vars/gw-elster.oopen.de.yml b/host_vars/gw-elster.oopen.de/gw-elster-common.yml similarity index 100% rename from host_vars/gw-elster.oopen.de.yml rename to host_vars/gw-elster.oopen.de/gw-elster-common.yml diff --git a/host_vars/gw-fhxb.oopen.de.yml b/host_vars/gw-fhxb.oopen.de/gw-fhxb-common.yml similarity index 100% rename from host_vars/gw-fhxb.oopen.de.yml rename to host_vars/gw-fhxb.oopen.de/gw-fhxb-common.yml diff --git a/host_vars/gw-flr.oopen.de.yml b/host_vars/gw-flr.oopen.de/gw-flr-common.yml similarity index 100% rename from host_vars/gw-flr.oopen.de.yml rename to host_vars/gw-flr.oopen.de/gw-flr-common.yml diff --git a/host_vars/gw-fm.oopen.de.yml b/host_vars/gw-fm.oopen.de/gw-fm-common.yml similarity index 100% rename from host_vars/gw-fm.oopen.de.yml rename to host_vars/gw-fm.oopen.de/gw-fm-common.yml diff --git a/host_vars/gw-irights.oopen.de.yml b/host_vars/gw-irights.oopen.de/gw-irights-common.yml similarity index 100% rename from host_vars/gw-irights.oopen.de.yml rename to host_vars/gw-irights.oopen.de/gw-irights-common.yml diff --git a/host_vars/gw-kb.oopen.de.yml b/host_vars/gw-kb.oopen.de/gw-kb-common.yml similarity index 100% rename from host_vars/gw-kb.oopen.de.yml rename to host_vars/gw-kb.oopen.de/gw-kb-common.yml diff --git a/host_vars/gw-km.oopen.de.yml b/host_vars/gw-km.oopen.de/gw-km-common.yml similarity index 100% rename from host_vars/gw-km.oopen.de.yml rename to host_vars/gw-km.oopen.de/gw-km-common.yml diff --git a/host_vars/gw-mbr.oopen.de.yml b/host_vars/gw-mbr.oopen.de/gw-mbr-common.yml similarity index 100% rename from host_vars/gw-mbr.oopen.de.yml rename to host_vars/gw-mbr.oopen.de/gw-mbr-common.yml diff --git a/host_vars/gw-opp-neu.opp.netz.yml b/host_vars/gw-opp-neu.opp.netz/gw-opp-neu-common.yml similarity index 100% rename from host_vars/gw-opp-neu.opp.netz.yml rename to host_vars/gw-opp-neu.opp.netz/gw-opp-neu-common.yml diff --git a/host_vars/gw-opp.oopen.de.yml b/host_vars/gw-opp.oopen.de/gw-opp-common.yml similarity index 100% rename from host_vars/gw-opp.oopen.de.yml rename to host_vars/gw-opp.oopen.de/gw-opp-common.yml diff --git a/host_vars/gw-replacement4.local.netz.yml b/host_vars/gw-replacement4.local.netz/gw-replacement4-common.yml similarity index 100% rename from host_vars/gw-replacement4.local.netz.yml rename to host_vars/gw-replacement4.local.netz/gw-replacement4-common.yml diff --git a/host_vars/gw-replacment.oopen.de.yml b/host_vars/gw-replacment.oopen.de/gw-replacment-common.yml similarity index 100% rename from host_vars/gw-replacment.oopen.de.yml rename to host_vars/gw-replacment.oopen.de/gw-replacment-common.yml diff --git a/host_vars/gw-replacment2.oopen.de.yml b/host_vars/gw-replacment2.oopen.de/gw-replacment2-common.yml similarity index 100% rename from host_vars/gw-replacment2.oopen.de.yml rename to host_vars/gw-replacment2.oopen.de/gw-replacment2-common.yml diff --git a/host_vars/gw-replacment3.oopen.de.yml b/host_vars/gw-replacment3.oopen.de/gw-replacment3-common.yml similarity index 100% rename from host_vars/gw-replacment3.oopen.de.yml rename to host_vars/gw-replacment3.oopen.de/gw-replacment3-common.yml diff --git a/host_vars/gw-spr.oopen.de.yml b/host_vars/gw-spr.oopen.de/gw-spr-common.yml similarity index 100% rename from host_vars/gw-spr.oopen.de.yml rename to host_vars/gw-spr.oopen.de/gw-spr-common.yml diff --git a/host_vars/iam-nd.oopen.de.yml b/host_vars/iam-nd.oopen.de/iam-nd-common.yml similarity index 100% rename from host_vars/iam-nd.oopen.de.yml rename to host_vars/iam-nd.oopen.de/iam-nd-common.yml diff --git a/host_vars/initiativenserver.oopen.de.yml b/host_vars/initiativenserver.oopen.de/initiativenserver-common.yml similarity index 100% rename from host_vars/initiativenserver.oopen.de.yml rename to host_vars/initiativenserver.oopen.de/initiativenserver-common.yml diff --git a/host_vars/keycloak-nd.oopen.de.yml b/host_vars/keycloak-nd.oopen.de/keycloak-nd-common.yml similarity index 100% rename from host_vars/keycloak-nd.oopen.de.yml rename to host_vars/keycloak-nd.oopen.de/keycloak-nd-common.yml diff --git a/host_vars/lists.mx.warenform.de.yml b/host_vars/lists.mx.warenform.de/lists.mx-common.yml similarity index 100% rename from host_vars/lists.mx.warenform.de.yml rename to host_vars/lists.mx.warenform.de/lists.mx-common.yml diff --git a/host_vars/lxc-host-kb.anw-kb.netz.yml b/host_vars/lxc-host-kb.anw-kb.netz/lxc-host-kb-common.yml similarity index 100% rename from host_vars/lxc-host-kb.anw-kb.netz.yml rename to host_vars/lxc-host-kb.anw-kb.netz/lxc-host-kb-common.yml diff --git a/host_vars/mail-neu.cadus.org.yml b/host_vars/mail-neu.cadus.org/mail-neu-common.yml similarity index 100% rename from host_vars/mail-neu.cadus.org.yml rename to host_vars/mail-neu.cadus.org/mail-neu-common.yml diff --git a/host_vars/mail.cadus.org.yml b/host_vars/mail.cadus.org/mail-common.yml similarity index 100% rename from host_vars/mail.cadus.org.yml rename to host_vars/mail.cadus.org/mail-common.yml diff --git a/host_vars/mail.faire-mobilitaet.de.yml b/host_vars/mail.faire-mobilitaet.de/mail-common.yml similarity index 100% rename from host_vars/mail.faire-mobilitaet.de.yml rename to host_vars/mail.faire-mobilitaet.de/mail-common.yml diff --git a/host_vars/matomo-01.oopen.de.yml b/host_vars/matomo-01.oopen.de/matomo-01-common.yml similarity index 100% rename from host_vars/matomo-01.oopen.de.yml rename to host_vars/matomo-01.oopen.de/matomo-01-common.yml diff --git a/host_vars/meet.akweb.de.yml b/host_vars/meet.akweb.de/meet-common.yml similarity index 100% rename from host_vars/meet.akweb.de.yml rename to host_vars/meet.akweb.de/meet-common.yml diff --git a/host_vars/meet.oopen.de.yml b/host_vars/meet.oopen.de/meet-common.yml similarity index 100% rename from host_vars/meet.oopen.de.yml rename to host_vars/meet.oopen.de/meet-common.yml diff --git a/host_vars/mm-irights.oopen.de.yml b/host_vars/mm-irights.oopen.de/mm-irights-common.yml similarity index 100% rename from host_vars/mm-irights.oopen.de.yml rename to host_vars/mm-irights.oopen.de/mm-irights-common.yml diff --git a/host_vars/mm-migration.oopen.de.yml b/host_vars/mm-migration.oopen.de/mm-migration-common.yml similarity index 100% rename from host_vars/mm-migration.oopen.de.yml rename to host_vars/mm-migration.oopen.de/mm-migration-common.yml diff --git a/host_vars/mm-rav.oopen.de.yml b/host_vars/mm-rav.oopen.de/mm-rav-common.yml similarity index 100% rename from host_vars/mm-rav.oopen.de.yml rename to host_vars/mm-rav.oopen.de/mm-rav-common.yml diff --git a/host_vars/mm.oopen.de.yml b/host_vars/mm.oopen.de/mm-common.yml similarity index 100% rename from host_vars/mm.oopen.de.yml rename to host_vars/mm.oopen.de/mm-common.yml diff --git a/host_vars/moodle.oopen.de.yml b/host_vars/moodle.oopen.de/moodle-common.yml similarity index 100% rename from host_vars/moodle.oopen.de.yml rename to host_vars/moodle.oopen.de/moodle-common.yml diff --git a/host_vars/munin.oopen.de.yml b/host_vars/munin.oopen.de/munin-common.yml similarity index 100% rename from host_vars/munin.oopen.de.yml rename to host_vars/munin.oopen.de/munin-common.yml diff --git a/host_vars/mx.warenform.de.yml b/host_vars/mx.warenform.de/mx-common.yml similarity index 100% rename from host_vars/mx.warenform.de.yml rename to host_vars/mx.warenform.de/mx-common.yml diff --git a/host_vars/nc-gw.oopen.de.yml b/host_vars/nc-gw.oopen.de/nc-gw-common.yml similarity index 100% rename from host_vars/nc-gw.oopen.de.yml rename to host_vars/nc-gw.oopen.de/nc-gw-common.yml diff --git a/host_vars/nd-archiv.warenform.de.yml b/host_vars/nd-archiv.warenform.de/nd-archiv-common.yml similarity index 100% rename from host_vars/nd-archiv.warenform.de.yml rename to host_vars/nd-archiv.warenform.de/nd-archiv-common.yml diff --git a/host_vars/nd-live.warenform.de.yml b/host_vars/nd-live.warenform.de/nd-live-common.yml similarity index 100% rename from host_vars/nd-live.warenform.de.yml rename to host_vars/nd-live.warenform.de/nd-live-common.yml diff --git a/host_vars/nd.warenform.de.yml b/host_vars/nd.warenform.de/nd-common.yml similarity index 100% rename from host_vars/nd.warenform.de.yml rename to host_vars/nd.warenform.de/nd-common.yml diff --git a/host_vars/nscache.oopen.de.yml b/host_vars/nscache.oopen.de/nscache-common.yml similarity index 100% rename from host_vars/nscache.oopen.de.yml rename to host_vars/nscache.oopen.de/nscache-common.yml diff --git a/host_vars/o12.oopen.de.yml b/host_vars/o12.oopen.de/o12-common.yml similarity index 100% rename from host_vars/o12.oopen.de.yml rename to host_vars/o12.oopen.de/o12-common.yml diff --git a/host_vars/o13-cryptpad.oopen.de.yml b/host_vars/o13-cryptpad.oopen.de/o13-cryptpad-common.yml similarity index 100% rename from host_vars/o13-cryptpad.oopen.de.yml rename to host_vars/o13-cryptpad.oopen.de/o13-cryptpad-common.yml diff --git a/host_vars/o13-mail.oopen.de.yml b/host_vars/o13-mail.oopen.de/o13-mail-common.yml similarity index 100% rename from host_vars/o13-mail.oopen.de.yml rename to host_vars/o13-mail.oopen.de/o13-mail-common.yml diff --git a/host_vars/o13-mumble.oopen.de.yml b/host_vars/o13-mumble.oopen.de/o13-mumble-common.yml similarity index 100% rename from host_vars/o13-mumble.oopen.de.yml rename to host_vars/o13-mumble.oopen.de/o13-mumble-common.yml diff --git a/host_vars/o13-pad.oopen.de.yml b/host_vars/o13-pad.oopen.de/o13-pad-common.yml similarity index 100% rename from host_vars/o13-pad.oopen.de.yml rename to host_vars/o13-pad.oopen.de/o13-pad-common.yml diff --git a/host_vars/o13-staging-board.oopen.de.yml b/host_vars/o13-staging-board.oopen.de/o13-staging-board-common.yml similarity index 100% rename from host_vars/o13-staging-board.oopen.de.yml rename to host_vars/o13-staging-board.oopen.de/o13-staging-board-common.yml diff --git a/host_vars/o13-web.oopen.de.yml b/host_vars/o13-web.oopen.de/o13-web-common.yml similarity index 100% rename from host_vars/o13-web.oopen.de.yml rename to host_vars/o13-web.oopen.de/o13-web-common.yml diff --git a/host_vars/o13.oopen.de.yml b/host_vars/o13.oopen.de/o13-common.yml similarity index 100% rename from host_vars/o13.oopen.de.yml rename to host_vars/o13.oopen.de/o13-common.yml diff --git a/host_vars/o17.oopen.de.yml b/host_vars/o17.oopen.de/o17-common.yml similarity index 100% rename from host_vars/o17.oopen.de.yml rename to host_vars/o17.oopen.de/o17-common.yml diff --git a/host_vars/o18.oopen.de.yml b/host_vars/o18.oopen.de/o18-common.yml similarity index 100% rename from host_vars/o18.oopen.de.yml rename to host_vars/o18.oopen.de/o18-common.yml diff --git a/host_vars/o19.oopen.de.yml b/host_vars/o19.oopen.de/o19-common.yml similarity index 100% rename from host_vars/o19.oopen.de.yml rename to host_vars/o19.oopen.de/o19-common.yml diff --git a/host_vars/o20.oopen.de.yml b/host_vars/o20.oopen.de/o20-common.yml similarity index 100% rename from host_vars/o20.oopen.de.yml rename to host_vars/o20.oopen.de/o20-common.yml diff --git a/host_vars/o21.oopen.de.yml b/host_vars/o21.oopen.de/o21-common.yml similarity index 100% rename from host_vars/o21.oopen.de.yml rename to host_vars/o21.oopen.de/o21-common.yml diff --git a/host_vars/o22.oopen.de.yml b/host_vars/o22.oopen.de/o22-common.yml similarity index 100% rename from host_vars/o22.oopen.de.yml rename to host_vars/o22.oopen.de/o22-common.yml diff --git a/host_vars/o23.oopen.de.yml b/host_vars/o23.oopen.de/o23-common.yml similarity index 100% rename from host_vars/o23.oopen.de.yml rename to host_vars/o23.oopen.de/o23-common.yml diff --git a/host_vars/o24.oopen.de.yml b/host_vars/o24.oopen.de/o24-common.yml similarity index 100% rename from host_vars/o24.oopen.de.yml rename to host_vars/o24.oopen.de/o24-common.yml diff --git a/host_vars/o25.oopen.de.yml b/host_vars/o25.oopen.de/o25-common.yml similarity index 100% rename from host_vars/o25.oopen.de.yml rename to host_vars/o25.oopen.de/o25-common.yml diff --git a/host_vars/o26.oopen.de.yml b/host_vars/o26.oopen.de/o26-common.yml similarity index 100% rename from host_vars/o26.oopen.de.yml rename to host_vars/o26.oopen.de/o26-common.yml diff --git a/host_vars/o27.oopen.de.yml b/host_vars/o27.oopen.de/o27-common.yml similarity index 100% rename from host_vars/o27.oopen.de.yml rename to host_vars/o27.oopen.de/o27-common.yml diff --git a/host_vars/o28.oopen.de.yml b/host_vars/o28.oopen.de/o28-common.yml similarity index 100% rename from host_vars/o28.oopen.de.yml rename to host_vars/o28.oopen.de/o28-common.yml diff --git a/host_vars/o29.oopen.de.yml b/host_vars/o29.oopen.de/o29-common.yml similarity index 100% rename from host_vars/o29.oopen.de.yml rename to host_vars/o29.oopen.de/o29-common.yml diff --git a/host_vars/o30.oopen.de.yml b/host_vars/o30.oopen.de/o30-common.yml similarity index 100% rename from host_vars/o30.oopen.de.yml rename to host_vars/o30.oopen.de/o30-common.yml diff --git a/host_vars/o31.oopen.de.yml b/host_vars/o31.oopen.de/o31-common.yml similarity index 100% rename from host_vars/o31.oopen.de.yml rename to host_vars/o31.oopen.de/o31-common.yml diff --git a/host_vars/o32.oopen.de.yml b/host_vars/o32.oopen.de/o32-common.yml similarity index 100% rename from host_vars/o32.oopen.de.yml rename to host_vars/o32.oopen.de/o32-common.yml diff --git a/host_vars/o33-neu.oopen.de.yml b/host_vars/o33-neu.oopen.de/o33-neu-common.yml similarity index 100% rename from host_vars/o33-neu.oopen.de.yml rename to host_vars/o33-neu.oopen.de/o33-neu-common.yml diff --git a/host_vars/o34.oopen.de.yml b/host_vars/o34.oopen.de/o34-common.yml similarity index 100% rename from host_vars/o34.oopen.de.yml rename to host_vars/o34.oopen.de/o34-common.yml diff --git a/host_vars/o35.oopen.de.yml b/host_vars/o35.oopen.de/o35-common.yml similarity index 100% rename from host_vars/o35.oopen.de.yml rename to host_vars/o35.oopen.de/o35-common.yml diff --git a/host_vars/o36.oopen.de.yml b/host_vars/o36.oopen.de/o36-common.yml similarity index 100% rename from host_vars/o36.oopen.de.yml rename to host_vars/o36.oopen.de/o36-common.yml diff --git a/host_vars/o38.oopen.de.yml b/host_vars/o38.oopen.de/o38-common.yml similarity index 100% rename from host_vars/o38.oopen.de.yml rename to host_vars/o38.oopen.de/o38-common.yml diff --git a/host_vars/o39.oopen.de.yml b/host_vars/o39.oopen.de/o39-common.yml similarity index 100% rename from host_vars/o39.oopen.de.yml rename to host_vars/o39.oopen.de/o39-common.yml diff --git a/host_vars/o40.oopen.de.yml b/host_vars/o40.oopen.de/o40-common.yml similarity index 100% rename from host_vars/o40.oopen.de.yml rename to host_vars/o40.oopen.de/o40-common.yml diff --git a/host_vars/o41.oopen.de.yml b/host_vars/o41.oopen.de/o41-common.yml similarity index 100% rename from host_vars/o41.oopen.de.yml rename to host_vars/o41.oopen.de/o41-common.yml diff --git a/host_vars/o42.oopen.de.yml b/host_vars/o42.oopen.de/o42-common.yml similarity index 100% rename from host_vars/o42.oopen.de.yml rename to host_vars/o42.oopen.de/o42-common.yml diff --git a/host_vars/o43.oopen.de.yml b/host_vars/o43.oopen.de/o43-common.yml similarity index 100% rename from host_vars/o43.oopen.de.yml rename to host_vars/o43.oopen.de/o43-common.yml diff --git a/host_vars/o44.oopen.de.yml b/host_vars/o44.oopen.de/o44-common.yml similarity index 100% rename from host_vars/o44.oopen.de.yml rename to host_vars/o44.oopen.de/o44-common.yml diff --git a/host_vars/oolm-db.oopen.de.yml b/host_vars/oolm-db.oopen.de/oolm-db-common.yml similarity index 100% rename from host_vars/oolm-db.oopen.de.yml rename to host_vars/oolm-db.oopen.de/oolm-db-common.yml diff --git a/host_vars/oolm-shop-dev.oopen.de.yml b/host_vars/oolm-shop-dev.oopen.de/oolm-shop-dev-common.yml similarity index 100% rename from host_vars/oolm-shop-dev.oopen.de.yml rename to host_vars/oolm-shop-dev.oopen.de/oolm-shop-dev-common.yml diff --git a/host_vars/oolm-shop.oopen.de.yml b/host_vars/oolm-shop.oopen.de/oolm-shop-common.yml similarity index 100% rename from host_vars/oolm-shop.oopen.de.yml rename to host_vars/oolm-shop.oopen.de/oolm-shop-common.yml diff --git a/host_vars/oolm-web.oopen.de.yml b/host_vars/oolm-web.oopen.de/oolm-web-common.yml similarity index 100% rename from host_vars/oolm-web.oopen.de.yml rename to host_vars/oolm-web.oopen.de/oolm-web-common.yml diff --git a/host_vars/piwik.warenform.de.yml b/host_vars/piwik.warenform.de/piwik-common.yml similarity index 100% rename from host_vars/piwik.warenform.de.yml rename to host_vars/piwik.warenform.de/piwik-common.yml diff --git a/host_vars/prometheus-nd.oopen.de.yml b/host_vars/prometheus-nd.oopen.de/prometheus-nd-common.yml similarity index 100% rename from host_vars/prometheus-nd.oopen.de.yml rename to host_vars/prometheus-nd.oopen.de/prometheus-nd-common.yml diff --git a/host_vars/psono-ndm.oopen.de.yml b/host_vars/psono-ndm.oopen.de/psono-ndm-common.yml similarity index 100% rename from host_vars/psono-ndm.oopen.de.yml rename to host_vars/psono-ndm.oopen.de/psono-ndm-common.yml diff --git a/host_vars/rage.so36.net.yml b/host_vars/rage.so36.net/rage-common.yml similarity index 100% rename from host_vars/rage.so36.net.yml rename to host_vars/rage.so36.net/rage-common.yml diff --git a/host_vars/server16.warenform.de.yml b/host_vars/server16.warenform.de/server16-common.yml similarity index 100% rename from host_vars/server16.warenform.de.yml rename to host_vars/server16.warenform.de/server16-common.yml diff --git a/host_vars/server18.warenform.de.yml b/host_vars/server18.warenform.de/server18-common.yml similarity index 100% rename from host_vars/server18.warenform.de.yml rename to host_vars/server18.warenform.de/server18-common.yml diff --git a/host_vars/server20.warenform.de.yml b/host_vars/server20.warenform.de/server20-common.yml similarity index 100% rename from host_vars/server20.warenform.de.yml rename to host_vars/server20.warenform.de/server20-common.yml diff --git a/host_vars/server22.warenform.de.yml b/host_vars/server22.warenform.de/server22-common.yml similarity index 100% rename from host_vars/server22.warenform.de.yml rename to host_vars/server22.warenform.de/server22-common.yml diff --git a/host_vars/server23.warenform.de.yml b/host_vars/server23.warenform.de/server23-common.yml similarity index 100% rename from host_vars/server23.warenform.de.yml rename to host_vars/server23.warenform.de/server23-common.yml diff --git a/host_vars/server24.warenform.de.yml b/host_vars/server24.warenform.de/server24-common.yml similarity index 100% rename from host_vars/server24.warenform.de.yml rename to host_vars/server24.warenform.de/server24-common.yml diff --git a/host_vars/server25.warenform.de.yml b/host_vars/server25.warenform.de/server25-common.yml similarity index 100% rename from host_vars/server25.warenform.de.yml rename to host_vars/server25.warenform.de/server25-common.yml diff --git a/host_vars/server26.warenform.de.yml b/host_vars/server26.warenform.de/server26-common.yml similarity index 100% rename from host_vars/server26.warenform.de.yml rename to host_vars/server26.warenform.de/server26-common.yml diff --git a/host_vars/server27.warenform.de.yml b/host_vars/server27.warenform.de/server27-common.yml similarity index 100% rename from host_vars/server27.warenform.de.yml rename to host_vars/server27.warenform.de/server27-common.yml diff --git a/host_vars/server28.warenform.de.yml b/host_vars/server28.warenform.de/server28-common.yml similarity index 100% rename from host_vars/server28.warenform.de.yml rename to host_vars/server28.warenform.de/server28-common.yml diff --git a/host_vars/shop-dev.aufstehen-gegen-rassismus.de.yml b/host_vars/shop-dev.aufstehen-gegen-rassismus.de/shop-dev-common.yml similarity index 100% rename from host_vars/shop-dev.aufstehen-gegen-rassismus.de.yml rename to host_vars/shop-dev.aufstehen-gegen-rassismus.de/shop-dev-common.yml diff --git a/host_vars/stolpersteine.oopen.de.yml b/host_vars/stolpersteine.oopen.de/stolpersteine-common.yml similarity index 100% rename from host_vars/stolpersteine.oopen.de.yml rename to host_vars/stolpersteine.oopen.de/stolpersteine-common.yml diff --git a/host_vars/test.mariadb.oopen.de.yml b/host_vars/test.mariadb.oopen.de/test.mariadb-common.yml similarity index 100% rename from host_vars/test.mariadb.oopen.de.yml rename to host_vars/test.mariadb.oopen.de/test.mariadb-common.yml diff --git a/host_vars/test.mx.oopen.de.yml b/host_vars/test.mx.oopen.de/test.mx-common.yml similarity index 100% rename from host_vars/test.mx.oopen.de.yml rename to host_vars/test.mx.oopen.de/test.mx-common.yml diff --git a/host_vars/test.mx.oopen.de/ipt-server.yml b/host_vars/test.mx.oopen.de/test.mx-ipt-server.yml similarity index 100% rename from host_vars/test.mx.oopen.de/ipt-server.yml rename to host_vars/test.mx.oopen.de/test.mx-ipt-server.yml diff --git a/host_vars/verdi-django.warenform.de.yml b/host_vars/verdi-django.warenform.de/verdi-django-common.yml similarity index 100% rename from host_vars/verdi-django.warenform.de.yml rename to host_vars/verdi-django.warenform.de/verdi-django-common.yml diff --git a/host_vars/vvn-shop.warenform.de.yml b/host_vars/vvn-shop.warenform.de/vvn-shop-common.yml similarity index 100% rename from host_vars/vvn-shop.warenform.de.yml rename to host_vars/vvn-shop.warenform.de/vvn-shop-common.yml diff --git a/host_vars/vvn-www.warenform.de.yml b/host_vars/vvn-www.warenform.de/vvn-www-common.yml similarity index 100% rename from host_vars/vvn-www.warenform.de.yml rename to host_vars/vvn-www.warenform.de/vvn-www-common.yml diff --git a/host_vars/web-01.oopen.de.yml b/host_vars/web-01.oopen.de/web-01-common.yml similarity index 100% rename from host_vars/web-01.oopen.de.yml rename to host_vars/web-01.oopen.de/web-01-common.yml diff --git a/host_vars/web-02.oopen.de.yml b/host_vars/web-02.oopen.de/web-02-common.yml similarity index 100% rename from host_vars/web-02.oopen.de.yml rename to host_vars/web-02.oopen.de/web-02-common.yml diff --git a/host_vars/web-03.oopen.de.yml b/host_vars/web-03.oopen.de/web-03-common.yml similarity index 100% rename from host_vars/web-03.oopen.de.yml rename to host_vars/web-03.oopen.de/web-03-common.yml diff --git a/host_vars/web-04.oopen.de.yml b/host_vars/web-04.oopen.de/web-04-common.yml similarity index 100% rename from host_vars/web-04.oopen.de.yml rename to host_vars/web-04.oopen.de/web-04-common.yml diff --git a/host_vars/web-05.oopen.de.yml b/host_vars/web-05.oopen.de/web-05-common.yml similarity index 100% rename from host_vars/web-05.oopen.de.yml rename to host_vars/web-05.oopen.de/web-05-common.yml diff --git a/host_vars/web-06.oopen.de.yml b/host_vars/web-06.oopen.de/web-06-common.yml similarity index 100% rename from host_vars/web-06.oopen.de.yml rename to host_vars/web-06.oopen.de/web-06-common.yml diff --git a/host_vars/web-07.oopen.de.yml b/host_vars/web-07.oopen.de/web-07-common.yml similarity index 100% rename from host_vars/web-07.oopen.de.yml rename to host_vars/web-07.oopen.de/web-07-common.yml diff --git a/host_vars/web-08.oopen.de.yml b/host_vars/web-08.oopen.de/web-08-common.yml similarity index 100% rename from host_vars/web-08.oopen.de.yml rename to host_vars/web-08.oopen.de/web-08-common.yml diff --git a/host_vars/web-09.oopen.de.yml b/host_vars/web-09.oopen.de/web-09-common.yml similarity index 100% rename from host_vars/web-09.oopen.de.yml rename to host_vars/web-09.oopen.de/web-09-common.yml diff --git a/host_vars/web-nd.oopen.de.yml b/host_vars/web-nd.oopen.de/web-nd-common.yml similarity index 100% rename from host_vars/web-nd.oopen.de.yml rename to host_vars/web-nd.oopen.de/web-nd-common.yml diff --git a/host_vars/web-test.oopen.de.yml b/host_vars/web-test.oopen.de/web-test-common.yml similarity index 100% rename from host_vars/web-test.oopen.de.yml rename to host_vars/web-test.oopen.de/web-test-common.yml diff --git a/host_vars/web.cadus.org.yml b/host_vars/web.cadus.org/web-common.yml similarity index 100% rename from host_vars/web.cadus.org.yml rename to host_vars/web.cadus.org/web-common.yml diff --git a/host_vars/web0.warenform.de.yml b/host_vars/web0.warenform.de/web0-common.yml similarity index 100% rename from host_vars/web0.warenform.de.yml rename to host_vars/web0.warenform.de/web0-common.yml diff --git a/host_vars/web1.warenform.de.yml b/host_vars/web1.warenform.de/web1-common.yml similarity index 100% rename from host_vars/web1.warenform.de.yml rename to host_vars/web1.warenform.de/web1-common.yml diff --git a/host_vars/web2.warenform.de.yml b/host_vars/web2.warenform.de/web2-common.yml similarity index 100% rename from host_vars/web2.warenform.de.yml rename to host_vars/web2.warenform.de/web2-common.yml diff --git a/host_vars/wiki.cadus.org.yml b/host_vars/wiki.cadus.org/wiki-common.yml similarity index 100% rename from host_vars/wiki.cadus.org.yml rename to host_vars/wiki.cadus.org/wiki-common.yml diff --git a/host_vars/www.oopen.de.yml b/host_vars/www.oopen.de/www-common.yml similarity index 100% rename from host_vars/www.oopen.de.yml rename to host_vars/www.oopen.de/www-common.yml diff --git a/host_vars/zapata-alt.opp.netz.yml b/host_vars/zapata-alt.opp.netz/zapata-alt-common.yml similarity index 100% rename from host_vars/zapata-alt.opp.netz.yml rename to host_vars/zapata-alt.opp.netz/zapata-alt-common.yml diff --git a/host_vars/zapata.opp.netz.yml b/host_vars/zapata.opp.netz/zapata-common.yml similarity index 100% rename from host_vars/zapata.opp.netz.yml rename to host_vars/zapata.opp.netz/zapata-common.yml diff --git a/hosts b/hosts index 1b506cf..6bb60cf 100644 --- a/hosts +++ b/hosts @@ -300,6 +300,9 @@ test-nd.oopen.de o44.oopen.de cl-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de + lxc-host-kb.anw-kb.netz @@ -523,6 +526,9 @@ test-nd.oopen.de o44.oopen.de cl-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de + lxc-host-kb.anw-kb.netz @@ -805,9 +811,8 @@ web-nd.oopen.de # o44 - ND cloud cl-nd.oopen.de -# ND - cloud -o44.oopen.de -cloud-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de # --- # O.OPEN office network @@ -1223,6 +1228,9 @@ web-nd.oopen.de # o44 - ND - cloud cl-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de + # --- # Warenform @@ -1320,6 +1328,9 @@ cl-flr.oopen.de # o44.oopen.de cl-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de + # --- # Warenform # --- @@ -1749,6 +1760,9 @@ test-nd.oopen.de # o44 - ND cloud cl-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de + # --- # O.OPEN office network # --- @@ -1998,6 +2012,9 @@ test-nd.oopen.de o44.oopen.de cl-nd.oopen.de +# Hetzner Cloud +cl-nd-test.oopen.de + # Gemeinchaft Altenschlirf