8 files changed, 79 insertions, 88 deletions
diff --git a/inventory/group_vars/chaos-at-home-sensors/vars.yml b/inventory/group_vars/chaos-at-home-sensors/vars.yml
index d6783736..c613974b 100644
--- a/inventory/group_vars/chaos-at-home-sensors/vars.yml
+++ b/inventory/group_vars/chaos-at-home-sensors/vars.yml
@@ -13,6 +13,7 @@ openwrt_packages_remove:
   - ppp
   - ppp-mod-pppoe
   - firewall
+  - firewall4
   - dnsmasq
   - odhcpd-ipv6only
 openwrt_packages_add:
@@ -20,7 +21,7 @@ openwrt_packages_add:
   - kmod-i2c-mux-pca954x
   - kmod-iio-bmp280-i2c
   - kmod-iio-am2315
-  - kmod-hwmon-ads1015
+  - kmod-iio-ads1015
   - kmod-hwmon-mcp3021
   - kmod-w1-master-ds2482
   - kmod-w1-slave-therm
@@ -92,11 +93,15 @@ openwrt_uci:
         RootPasswordAuth: 'off'
         Port: '{{ ansible_port }}'
 
+  uhttpd:
+    - name: uhttpd main
+      options:
+        enabled: '0'
+
   prometheus-node-exporter-lua:
     - name: prometheus-node-exporter-lua 'main'
       options:
         listen_interface: 'iot'
-        listen_ipv6: '0'
         listen_port: '9100'
 
   network:
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index c6279ed6..29e53a2b 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -13,7 +13,6 @@ network_zones:
       limit: 199
     offsets:
       ch-equinox-ws: 1
-      ch-mc: 10 ### legacy
       ch-mclr: 10
       ch-mcbr: 11
       ch-telesto: 20
diff --git a/inventory/host_vars/ch-cm4-test.yml b/inventory/host_vars/ch-cm4-test.yml
index 314f7f2b..9a013fdf 100644
--- a/inventory/host_vars/ch-cm4-test.yml
+++ b/inventory/host_vars/ch-cm4-test.yml
@@ -23,7 +23,3 @@ raspios_boot_config:
     line: 'hdmi_enable_4kp60=1'
 
 base_entropy_generator: rngd
-
-
-kodi_standalone_support_packages_extra:
-  - libgl1-mesa-dri ## missing dep for RaspiOS Kodi Package, TODO: bugreport
diff --git a/inventory/host_vars/ch-mc.yml b/inventory/host_vars/ch-mc.yml
deleted file mode 100644
index 45c2d82d..00000000
--- a/inventory/host_vars/ch-mc.yml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-debian_preseed_language: de
-debian_preseed_country: AT
-debian_preseed_locales:
-  - de_AT.UTF-8
-  - de_DE.UTF-8
-  - en_US.UTF-8
-
-debian_preseed_no_splash: no
-debian_preseed_install_tasks:
-  - xubuntu-desktop
-
-
-install:
-  efi: no
-  disks:
-    primary: /dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-B7P98I86F4PC14I7
-  system_lvm:
-    volumes:
-    - name: root
-      size: 30G
-      filesystem: ext4
-      mountpoint: /
-    - name: var+log
-      size: 768M
-      filesystem: ext4
-      mountpoint: /var/log
-      mount_options:
-      - noatime
-      - nodev
-      - noexec
-
-network:
-  nameservers: "{{ network_zones.lan.dns }}"
-  domain: "{{ host_domain }}"
-  primary: &_network_primary_
-    name: eno1
-    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
-    gateway: "{{ network_zones.lan.gateway }}"
-  interfaces:
-  - *_network_primary_
-
-
-base_modules_blacklist: "{{ base_modules_blacklist_none }}"
-
-apt_repo_components:
-  - main
-  - restricted
-  - universe
-  - multiverse
-
-
-ws_base_extra_packages:
-  - nfs-common
-  # needs apt-repo/kodi
-  - kodi
-  - kodi-inputstream-rtmp
-  - kodi-inputstream-adaptive
-
-ws_base_lightdm_defaults:
-  autologin-user: equinox
-  autologin-user-timeout: 0
-
-ws_users:
-  - equinox
-
-
-# kodi_standalone_support_packages_extra:
-#   - i965-va-driver-shaders
-
-# kodi_standalone_use_backports: yes
-# kodi_standalone_kodi_packages_extra:
-#   - kodi-repository-kodi
-#   - kodi-inputstream-adaptive
-#   - kodi-inputstream-rtmp
diff --git a/inventory/host_vars/ch-mcbr.yml b/inventory/host_vars/ch-mcbr.yml
index 1ac236c8..fb464fb5 100644
--- a/inventory/host_vars/ch-mcbr.yml
+++ b/inventory/host_vars/ch-mcbr.yml
@@ -45,3 +45,25 @@ kodi_standalone_kodi_packages_extra:
   - kodi-repository-kodi
   - kodi-inputstream-adaptive
   - kodi-inputstream-rtmp
+
+kodi_config_nfs4_mounts:
+  - src: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus']) | ansible.utils.ipaddr('address') }}:/"
+    path: /srv/files
+
+kodi_config_guisettings:
+  locale.keyboardlayouts: "German ABC|German QWERTZ"
+  locale.activekeyboardlayout: "German QWERTZ"
+  locale.country: Central Europe
+  locale.timezonecountry: Austria
+  locale.timezone: Europe/Vienna
+  services.devicename: "chaos at media (br)"
+  services.webserver: "true"
+  services.webserverauthentication: "false"
+  services.esallinterfaces: "true"
+
+kodi_config_sources:
+  video:
+  - name: Series
+    path: /srv/files/series
+  - name: Movies
+    path: /srv/files/movies
diff --git a/inventory/host_vars/ch-mclr.yml b/inventory/host_vars/ch-mclr.yml
new file mode 100644
index 00000000..457ee062
--- /dev/null
+++ b/inventory/host_vars/ch-mclr.yml
@@ -0,0 +1,45 @@
+---
+raspios_variant: lite
+raspios_arch: arm64
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eth0
+    address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.lan.gateway }}"
+  interfaces:
+  - *_network_primary_
+
+raspios_boot_config:
+  - regexp: '^#?hdmi_enable_4kp60=1'
+    line: 'hdmi_enable_4kp60=1'
+
+base_entropy_generator: rngd
+
+
+kodi_standalone_support_packages_extra:
+  - libgl1-mesa-dri ## missing dep for RaspiOS Kodi Package, TODO: bugreport
+
+kodi_config_nfs4_mounts:
+  - src: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus']) | ansible.utils.ipaddr('address') }}:/"
+    path: /srv/files
+
+kodi_config_guisettings:
+  locale.keyboardlayouts: "German ABC|German QWERTZ"
+  locale.activekeyboardlayout: "German QWERTZ"
+  locale.country: Central Europe
+  locale.timezonecountry: Austria
+  locale.timezone: Europe/Vienna
+  services.devicename: "chaos at media (lr)"
+  services.webserver: "true"
+  services.webserverauthentication: "false"
+  services.esallinterfaces: "true"
+
+kodi_config_sources:
+  video:
+  - name: Series
+    path: /srv/files/series
+  - name: Movies
+    path: /srv/files/movies
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index 952d07bd..63aabf94 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -242,17 +242,17 @@ openwrt_uci:
         RootPasswordAuth: 'off'
         Port: '{{ ansible_port | default(22) }}'
 
+  uhttpd:
+    - name: uhttpd main
+      options:
+        enabled: '0'
+
   prometheus-node-exporter-lua:
     - name: prometheus-node-exporter-lua 'main'
       options:
         listen_interface: 'mgmt'
         listen_port: '9100'
 
-  uhttpd:
-    - name: uhttpd main
-      options:
-        enabled: '0'
-
   openvpn:
     - name: openvpn 'extern'
       options:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 3e4288dc..8bbf4316 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -36,7 +36,6 @@ ch-vpn host_name=vpn
 ch-mon host_name=mon
 ch-omd host_name=omd
 ch-epimetheus host_name=epimetheus
-ch-mc host_name=mc
 ch-mclr host_name=mclr
 ch-mcbr host_name=mcbr
 ch-atlas host_name=atlas