diff options
| -rw-r--r-- | chaos-at-home/ch-gw-lan.yml | 2 | ||||
| -rw-r--r-- | chaos-at-home/ch-mc.yml | 32 | ||||
| -rw-r--r-- | chaos-at-home/ch-mclr.yml (renamed from chaos-at-home/ch-cm4-test.yml) | 4 | ||||
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-cm4-test.yml | 26 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mc.yml | 75 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mclr.yml | 45 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 | ||||
| -rw-r--r-- | roles/kodi/config/tasks/main.yml | 3 |
9 files changed, 50 insertions, 139 deletions
diff --git a/chaos-at-home/ch-gw-lan.yml b/chaos-at-home/ch-gw-lan.yml index 37ed17fa..e845c385 100644 --- a/chaos-at-home/ch-gw-lan.yml +++ b/chaos-at-home/ch-gw-lan.yml @@ -20,7 +20,7 @@ - name: epimetheus interface: lan0 mac: 90:2b:34:35:da:88 - - name: mc + - name: mcbr interface: lan0 mac: 00:1e:8c:f4:e6:d8 loop_control: diff --git a/chaos-at-home/ch-mc.yml b/chaos-at-home/ch-mc.yml deleted file mode 100644 index 8ded2b5a..00000000 --- a/chaos-at-home/ch-mc.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- name: Basic Setup - hosts: ch-mc - roles: - - role: apt-repo/base - - role: core/base - - role: core/sshd/base - - role: core/zsh - - role: core/cpu-microcode - -- name: Payload Setup - hosts: ch-mc - roles: - - role: network/wakeonlan - # - role: apt-repo/backports - # - role: kodi/standalone - - role: apt-repo/kodi - - role: ws/base - - role: ws/users - post_tasks: - - name: install nfs client packages - apt: - name: nfs-common - state: present - - - name: mount fileserver volumes - mount: - src: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus']) | ansible.utils.ipaddr('address') }}:/" - path: /srv/files - fstype: nfs4 - opts: nodev,x-systemd.automount,nofail,ro - state: mounted diff --git a/chaos-at-home/ch-cm4-test.yml b/chaos-at-home/ch-mclr.yml index 599fe561..d6aa7ae1 100644 --- a/chaos-at-home/ch-cm4-test.yml +++ b/chaos-at-home/ch-mclr.yml @@ -1,6 +1,6 @@ --- - name: Basic Setup - hosts: ch-cm4-test + hosts: ch-mclr roles: - role: apt-repo/base - role: core/base @@ -9,7 +9,7 @@ - role: core/ntp - name: Payload Setup - hosts: ch-cm4-test + hosts: ch-mclr roles: - role: kodi/standalone - role: kodi/config 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 03c5d33c..9a013fdf 100644 --- a/inventory/host_vars/ch-cm4-test.yml +++ b/inventory/host_vars/ch-cm4-test.yml @@ -23,29 +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 - -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 (cm4-test)" - 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-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-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/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 diff --git a/roles/kodi/config/tasks/main.yml b/roles/kodi/config/tasks/main.yml index e3c6ef25..4bfa2f5c 100644 --- a/roles/kodi/config/tasks/main.yml +++ b/roles/kodi/config/tasks/main.yml @@ -21,6 +21,7 @@ name: kodi.service state: stopped + ## https://github.com/jose1711/kodi-ansible-role - name: configure guisettings.xml loop: "{{ kodi_config_guisettings | dict2items }}" loop_control: @@ -31,7 +32,7 @@ value: "{{ item.value }}" pretty_print: yes -- name: configure guisettings.xml +- name: configure guisettings.xml - remove defaults loop: "{{ kodi_config_guisettings | dict2items }}" loop_control: label: "{{ item.key }} = {{ item.value }}" |