diff options
Diffstat (limited to 'inventory/group_vars')
-rw-r--r-- | inventory/group_vars/accesspoints/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/all/users.yml | 8 | ||||
-rw-r--r-- | inventory/group_vars/all/vars.yml | 39 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home-ups/vars.yml | 3 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 9 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home_hetzner/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home_mur-at/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/chaos-at-home_n28/vars.yml | 5 | ||||
-rw-r--r-- | inventory/group_vars/ele-infobeamer/vars.yml | 4 | ||||
-rw-r--r-- | inventory/group_vars/ele-ups/vars.yml | 3 | ||||
-rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/promzone-chaos-at-home/vars.yml | 9 | ||||
-rw-r--r-- | inventory/group_vars/promzone-elevate-festival/vars.yml | 6 | ||||
-rw-r--r-- | inventory/group_vars/ups/vars.yml | 1 | ||||
-rw-r--r-- | inventory/group_vars/vmhost-sk-2024/vars.yml | 27 |
16 files changed, 99 insertions, 25 deletions
diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml index 8c4d44db..653c2262 100644 --- a/inventory/group_vars/accesspoints/vars.yml +++ b/inventory/group_vars/accesspoints/vars.yml @@ -148,9 +148,7 @@ openwrt_packages_add: - less - nano - tcpdump-mini - - horst - prometheus-node-exporter-lua - - prometheus-node-exporter-lua-nat_traffic - prometheus-node-exporter-lua-netstat - prometheus-node-exporter-lua-openwrt ## we will install a custom version of these collectors, see below diff --git a/inventory/group_vars/all/users.yml b/inventory/group_vars/all/users.yml index 3fb26b34..0dce7e82 100644 --- a/inventory/group_vars/all/users.yml +++ b/inventory/group_vars/all/users.yml @@ -49,9 +49,6 @@ ssh_key_map: chaos-at-home: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL8afqxWieebpxezBuLj2CIx/iAuTY9ziJt8JCJE0qYh+B2wXe9e+sPaKwz5yyS0X0MoEPHbYuVytxGQfGhdVR57gWWTYq5MBBFEqmu5MexAFKlNxad4TNQQwhs7rnI+lptKJO+rqeG/vaQBgao+61ZVwRR5Zr1zsXEoo5m4VB8VPo3TW0nSb97LdMyUmb1TaqDKJ5hrtrV6YcokXzE8FwHMK15oJsuJC7YUReijol3hGsRVw1H5S1zu4uDz7G32dPVxoLOPgupnf0SxnXdNVfNU50MHHSK68HzBXz4/rE1YLacRPloOhO7xegkWd5KGa09opEbUGzGu/lSXgHuAJpPgloy14cehDhLJ7F7SbXK4QBBtVgV+1CYXG2eJsRHIdkWiTWLuG+QZ4oEFLjQBjWpUYsEiDt9FEtSVCtKH2vBk26ps5yIoSCtYq6POvg9miGgcpQA6HHwh5ekVUaKRGWuMdAIvjvQSlCsFjYkxD1NpCgU1RhyWWTI3xTSKzTxcXiCWWZoBDJVoW46EpSvySsOpxL/hLxJwMR8ouc6cPRZZl3m51824Rv3LdEXNBmn3vnojzIvrOed3sxpD0+7+tbA4J1uTbAxtkOMhK94WXKiUAOD7e5bJYdzajvDD2T9tkj/Mqdo8z3iR2/yjkGMEAeWWVOQEh7QhQS7OFEAKK4fw== equinox@chaos-at-home.org - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBO6D6zd2fJiBiacdHFPQ99XadnS8GPjicYxL5+8Zjjb equinox@chaos-at-home.org - dan: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICU107TyOHAQjWTq6A05IiazdoOvzmrSOOgvjRiih/z+ equinox@elevate.at spreadspace: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFw9I25dUMCMM66lIvt6VeBMhAX7tl4qvb7HxXQd8z equinox@spreadspace.org @@ -64,3 +61,8 @@ ssh_key_map: realraum: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDj7AcnQZCRihToOI7/L5YslP4bkZlZwR2dg6hV8EfQ+37z1p0imhoqc2Oz/zIEgOVARBHkn5XmfR9Bu6e3YfKpXpJXC9O3jpRSw34Xac/8qXzWZsqVAXbtzvBlYA/G4j0NQM9XIVBa1ZzBZu87xeE4KUWzO80fnQ+G3GSBp28BM4TUiSOmX9y58chPZfUp2DE80fInoXv11ikLLCBDXfMkzFCZ4Gcexhr0TYcBUgLV7ufL0xqLg4yE+Z21PLtttvVYgZIers2nWetLPoREi5yDGKeCjJVyT00X2rp6h3eFkc/VaHfb5c2MY9/4BOt+cbFCx73sG0C1SnSzWd624K/8CEoJTsX4MazLLrxwi3hIwiYX1mCCfq4+S4PpSFvMUGdMWB52PkBRXulQislCVBA/lzma93xJr1jWVFSikjkvAUt8Zt33vHMRd7RMYDfsDVIEKpUT49cBj0v7zs6IVE858J33sUZoVXaiA2sjsap8RguNtjJMSYx8+nwkQAjxwlTiV2J6pHGQHJDyeVsqGlnMpEk32ZeSs/BQ7XWPG62FT3SN6E4C/fa8dawvs7RgY0cbZkhucECBu9Zto/KakIhzLtFzgDighPmK5SlAPoNEJLJYPo5ry2SBTysc4uV7xYZSQ6OVofeQeFXKL8oPe/ZAvKafn3Zk0mQcCtH0Z8q8iQ== equinox@realraum.at - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF70nrRNdkB/PnoKp+2nmjRavHIexOsS4IrC7Ah0bnwJ equinox@r3.at + elevate: + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICU107TyOHAQjWTq6A05IiazdoOvzmrSOOgvjRiih/z+ equinox@elevate.at + skillz: + - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEjFaRBmI3JY12earMMxw7t8t4J4fGya8tb1AXUc/wm equinox@skillz.biz diff --git a/inventory/group_vars/all/vars.yml b/inventory/group_vars/all/vars.yml index 310a9784..fa0a7b6a 100644 --- a/inventory/group_vars/all/vars.yml +++ b/inventory/group_vars/all/vars.yml @@ -49,7 +49,7 @@ apt_repo_providers: host: archive.debian.org path: /debian ubuntu: - host: archive.ubuntu.com + host: at.archive.ubuntu.com path: /ubuntu raspbian: host: raspbian.raspberrypi.org @@ -57,6 +57,9 @@ apt_repo_providers: kali: host: http.kali.org path: /kali + raspios: + host: archive.raspberrypi.com + path: /debian hetzner: debian: host: mirror.hetzner.de @@ -76,6 +79,9 @@ apt_repo_providers: kali: host: http.kali.org path: /kali + raspios: + host: archive.raspberrypi.com + path: /debian ffgraz: debian: host: debian.ffgraz.net @@ -95,6 +101,9 @@ apt_repo_providers: kali: host: http.kali.org path: /kali + raspios: + host: archive.raspberrypi.com + path: /debian inode: debian: host: debian.inode.at @@ -114,6 +123,9 @@ apt_repo_providers: kali: host: http.kali.org path: /kali + raspios: + host: archive.raspberrypi.com + path: /debian anexia: debian: host: debian.anexia.at @@ -133,6 +145,31 @@ apt_repo_providers: kali: host: http.kali.org path: /kali + raspios: + host: archive.raspberrypi.com + path: /debian + chaos-at-home-cache: + debian: + host: apt.chaos-at-home.org + path: /debian + debian_security: + host: apt.chaos-at-home.org + path: /debian-security + debian_archive: + host: apt.chaos-at-home.org + path: /debian-archive + ubuntu: + host: apt.chaos-at-home.org + path: /ubuntu + raspbian: + host: debian.anexia.at + path: /raspbian/raspbian + kali: + host: apt.chaos-at-home.org + path: /kali + raspios: + host: apt.chaos-at-home.org + path: /raspios acme_directory_server_le_live_v1: "https://acme-v01.api.letsencrypt.org/directory" diff --git a/inventory/group_vars/chaos-at-home-ups/vars.yml b/inventory/group_vars/chaos-at-home-ups/vars.yml index 31be4572..5c0de008 100644 --- a/inventory/group_vars/chaos-at-home-ups/vars.yml +++ b/inventory/group_vars/chaos-at-home-ups/vars.yml @@ -16,6 +16,5 @@ prometheus_exporters_default: prometheus_job_multitarget_nut__ups: ch-mon: - - instance: "ups-{{ ups_name }}" - ups: "{{ ups_name }}" + - ups: "{{ ups_name }}" server: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 1108ebb1..9b53d52a 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -59,6 +59,8 @@ network_zones: iot: vlan: 30 prefix: 192.168.30.0/24 + dns: + - 192.168.30.254 wifi: ssid: "stuff at home" #encryption: "sae-mixed" @@ -70,6 +72,8 @@ network_zones: ch-sensors1: 11 ch-sensors2: 12 ch-testvm-phoebe: 43 + ch-cm4-sensors0: 200 + ch-cm4-sensors1: 201 ch-mon: 230 ch-iot: 254 @@ -83,6 +87,7 @@ network_zones: - 195.58.161.122 offsets: ch-apps: 1 + ch-repo: 7 ch-http-proxy: 8 ch-imap-proxy: 9 ch-vpn: 10 @@ -96,8 +101,6 @@ network_zones: ch-gw-c3voc: 73 __svc_http__: 80 __svc_imap__: 143 - ch-cm4-sensors0: 200 - ch-cm4-sensors1: 201 ch-mon: 230 ch-greenbone: 231 ch-router-obsd: 253 @@ -117,6 +120,8 @@ network_zones: ch-telesto: 102 # IPMI ch-sw0: 200 ch-sw1: 201 + ch-sw2: 202 + ch-sw3: 203 ch-ups-test0: 210 ch-ups-test1: 211 ch-ap0: 220 diff --git a/inventory/group_vars/chaos-at-home/vars.yml b/inventory/group_vars/chaos-at-home/vars.yml index 0cc12f3b..0f0a8d0d 100644 --- a/inventory/group_vars/chaos-at-home/vars.yml +++ b/inventory/group_vars/chaos-at-home/vars.yml @@ -3,8 +3,6 @@ zsh_banner: chaos-at-home acme_account_email: admin@chaos-at-home.org -apt_repo_provider: anexia - apt_repo_blackmagic_auth: username: "chaos-at-home" password: "{{ vault_apt_repo_blackmagic_auth.password }}" diff --git a/inventory/group_vars/chaos-at-home_hetzner/vars.yml b/inventory/group_vars/chaos-at-home_hetzner/vars.yml new file mode 100644 index 00000000..5ba257ac --- /dev/null +++ b/inventory/group_vars/chaos-at-home_hetzner/vars.yml @@ -0,0 +1,2 @@ +--- +apt_repo_provider: hetzner diff --git a/inventory/group_vars/chaos-at-home_mur-at/vars.yml b/inventory/group_vars/chaos-at-home_mur-at/vars.yml new file mode 100644 index 00000000..a5990598 --- /dev/null +++ b/inventory/group_vars/chaos-at-home_mur-at/vars.yml @@ -0,0 +1,2 @@ +--- +apt_repo_provider: ffgraz diff --git a/inventory/group_vars/chaos-at-home_n28/vars.yml b/inventory/group_vars/chaos-at-home_n28/vars.yml new file mode 100644 index 00000000..72806e7f --- /dev/null +++ b/inventory/group_vars/chaos-at-home_n28/vars.yml @@ -0,0 +1,5 @@ +--- +apt_repo_provider: chaos-at-home-cache +docker_com_apt_repo_baseurl: http://apt.chaos-at-home.org/docker-com +kubernetes_apt_repo_baseurl: http://apt.chaos-at-home.org/kubernetes +spreadspace_apt_repo_baseurl: http://apt.chaos-at-home.org/spreadspace diff --git a/inventory/group_vars/ele-infobeamer/vars.yml b/inventory/group_vars/ele-infobeamer/vars.yml index 9aabdfd8..d2407fce 100644 --- a/inventory/group_vars/ele-infobeamer/vars.yml +++ b/inventory/group_vars/ele-infobeamer/vars.yml @@ -10,7 +10,7 @@ info_beamer_wireless: info_beamer_prefer_wired: true -info_beamer_branding_logo: "{{ global_files_dir }}/dan/elevate/info-beamer/branding.ppm" -info_beamer_branding_background: "{{ global_files_dir }}/dan/elevate/info-beamer/e24-branding.jpg" +info_beamer_branding_logo: "{{ global_files_dir }}/elevate/info-beamer/branding.ppm" +info_beamer_branding_background: "{{ global_files_dir }}/elevate/info-beamer/e24-branding.jpg" info_beamer_device_connect_key: "{{ vault_info_beamer_device_connect_key }}" diff --git a/inventory/group_vars/ele-ups/vars.yml b/inventory/group_vars/ele-ups/vars.yml index 6146bc37..7d99ac83 100644 --- a/inventory/group_vars/ele-ups/vars.yml +++ b/inventory/group_vars/ele-ups/vars.yml @@ -20,6 +20,5 @@ prometheus_exporters_default: prometheus_job_multitarget_nut__ups: ele-calypso: - - instance: "ups-{{ ups_name }}" - ups: "{{ ups_name }}" + - ups: "{{ ups_name }}" server: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 53efafba..b236f0f9 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -172,7 +172,7 @@ network_zones: ele-br-tub0: 99 # --> ele-br-nextlib0 ### Monitoring - ele-calypso: 203 + ele-calypso: 209 ### UPS ele-ups-hmtsaal0: 210 diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml index 67a33f15..752bada7 100644 --- a/inventory/group_vars/promzone-chaos-at-home/vars.yml +++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml @@ -5,18 +5,18 @@ prometheus_exporters_extra: [] prometheus_exporters_default: - node -prometheus_exporter_node_version: 1.8.0 +prometheus_exporter_node_version: 1.8.2 prometheus_exporter_ipmi_version: 1.8.0 prometheus_exporter_ssl_version: 2.4.3 prometheus_exporter_blackbox_version: 0.25.0 prometheus_exporter_nut_version: 3.1.1 prometheus_exporter_smokeping_version: 0.8.1 prometheus_exporter_bind_version: 0.7.0 -prometheus_exporter_chrony_version: 0.10.0 +prometheus_exporter_chrony_version: 0.10.1 prometheus_exporter_chrony_disable_dns_lookups: yes -prometheus_exporter_mosquitto_version: 0.7.2 +prometheus_exporter_mosquitto_version: 0.7.3 -prometheus_server_version: 2.51.2 +prometheus_server_version: 2.54.1 prometheus_alertmanager_version: 0.27.0 prometheus_server: ch-mon @@ -36,6 +36,7 @@ prometheus_server_jobs: - standalone-kubelet - whawty-nginx-sso - mosquitto + - coredns prometheus_zone_name: chaos@home diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml index ba4756ae..398f1511 100644 --- a/inventory/group_vars/promzone-elevate-festival/vars.yml +++ b/inventory/group_vars/promzone-elevate-festival/vars.yml @@ -5,15 +5,15 @@ prometheus_exporters_extra: [] prometheus_exporters_default: - node -prometheus_exporter_node_version: 1.8.0 +prometheus_exporter_node_version: 1.8.2 prometheus_exporter_ipmi_version: 1.8.0 prometheus_exporter_ssl_version: 2.4.3 prometheus_exporter_blackbox_version: 0.25.0 prometheus_exporter_nut_version: 3.1.1 -prometheus_exporter_chrony_version: 0.10.0 +prometheus_exporter_chrony_version: 0.10.1 prometheus_exporter_chrony_disable_dns_lookups: yes -prometheus_server_version: 2.51.2 +prometheus_server_version: 2.54.1 prometheus_alertmanager_version: 0.27.0 prometheus_server: ele-calypso diff --git a/inventory/group_vars/ups/vars.yml b/inventory/group_vars/ups/vars.yml index bfcbb0a7..52cc65ac 100644 --- a/inventory/group_vars/ups/vars.yml +++ b/inventory/group_vars/ups/vars.yml @@ -30,7 +30,6 @@ openwrt_packages_add: - nut-upsc - nut-upscmd - prometheus-node-exporter-lua - - prometheus-node-exporter-lua-nat_traffic - prometheus-node-exporter-lua-netstat - prometheus-node-exporter-lua-openwrt diff --git a/inventory/group_vars/vmhost-sk-2024/vars.yml b/inventory/group_vars/vmhost-sk-2024/vars.yml new file mode 100644 index 00000000..295e1535 --- /dev/null +++ b/inventory/group_vars/vmhost-sk-2024/vars.yml @@ -0,0 +1,27 @@ +--- +vm_host: + name: sk-2024 + network: + dns: + - 185.12.64.1 + - 185.12.64.2 + bridges: + public: + prefix: 192.168.242.0/24 + offsets: + sk-cloudio: 24 + # sk-??: 31 + sk-2024: 254 + nat: yes + overlays: + default: + prefix: 94.130.242.0/24 + offsets: + sk-cloudio: 24 + # sk-??: 31 + zfs: + default: + pool: storage + name: vm + properties: + compression: lz4 |