From a19acdbbd671ca9d8a80c7013db54dd3e6fc7e3f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 5 Apr 2024 01:59:05 +0200 Subject: glt: prepare browser-kisok display boxes --- inventory/host_vars/glt-dione.yml | 4 +-- inventory/host_vars/glt-helene.yml | 4 +-- inventory/host_vars/glt-hpws-mini1.yml | 56 ++++++++++++++++++++++++++++++++++ inventory/host_vars/glt-hpws-mini2.yml | 56 ++++++++++++++++++++++++++++++++++ inventory/host_vars/glt-tarvos.yml | 56 ++++++++++++++++++++++++++++++++++ inventory/host_vars/glt-telesto.yml | 5 ++- inventory/host_vars/glt-thetys.yml | 4 +-- inventory/hosts.ini | 3 ++ spreadspace/glt-browser-kiosk.yml | 15 +++++++++ 9 files changed, 194 insertions(+), 9 deletions(-) create mode 100644 inventory/host_vars/glt-hpws-mini1.yml create mode 100644 inventory/host_vars/glt-hpws-mini2.yml create mode 100644 inventory/host_vars/glt-tarvos.yml create mode 100644 spreadspace/glt-browser-kiosk.yml diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index 58f442a0..3616a05c 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -14,8 +14,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: 192.168.28.23/24 - gateway: 192.168.28.254 + address: 10.73.7.100/16 + gateway: 10.73.0.254 interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index 71ababaa..22665c8c 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -14,8 +14,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: 192.168.28.24/24 - gateway: 192.168.28.254 + address: 10.73.7.3/16 + gateway: 10.73.0.254 interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-hpws-mini1.yml b/inventory/host_vars/glt-hpws-mini1.yml new file mode 100644 index 00000000..9c87a970 --- /dev/null +++ b/inventory/host_vars/glt-hpws-mini1.yml @@ -0,0 +1,56 @@ +--- +install_playbook: glt-browser-kiosk +install: + efi: yes + disks: + primary: /dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_20123D806706 + system_lvm: + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: home + size: 80G + filesystem: ext4 + mountpoint: /home + kernel_cmdline: + - "consoleblank=0" + +network: + nameservers: + - 1.1.1.1 + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: 10.73.7.21/16 + gateway: 10.73.0.254 + interfaces: + - *_network_primary_ + + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + + +browser_kiosk_xinit_commands_extra: | + xrandr --output HDMI-1 --mode 1920x1080 --rate 50 + +browser_kiosk_asound_conf: | + pcm.hdmi0 { type hw; card HDMI; device 3; } + ctl.hdmi0 { type hw; card HDMI; device 3; } + pcm.analog { type hw; card PCH; } + ctl.analog { type hw; card PCH; } + + pcm.!default pcm.hdmi0 + ctl.!default ctl.hdmi0 + + +browser_kiosk_url: "https://{{ hostvars['glt-jitsi'].jitsi_meet_hostname }}/stream-ui/player.html#control={{ hostvars['glt-jitsi'].jitsi_meet_streamui.default_control_room }}&displayName={{ host_name }}" diff --git a/inventory/host_vars/glt-hpws-mini2.yml b/inventory/host_vars/glt-hpws-mini2.yml new file mode 100644 index 00000000..9a10993b --- /dev/null +++ b/inventory/host_vars/glt-hpws-mini2.yml @@ -0,0 +1,56 @@ +--- +install_playbook: glt-browser-kiosk +install: + efi: yes + disks: + primary: /dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_200854443001 + system_lvm: + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: home + size: 80G + filesystem: ext4 + mountpoint: /home + kernel_cmdline: + - "consoleblank=0" + +network: + nameservers: + - 1.1.1.1 + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: 10.73.7.22/16 + gateway: 10.73.0.254 + interfaces: + - *_network_primary_ + + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + + +browser_kiosk_xinit_commands_extra: | + xrandr --output HDMI-1 --mode 1920x1080 --rate 50 + +browser_kiosk_asound_conf: | + pcm.hdmi0 { type hw; card PCH; device 3; } + ctl.hdmi0 { type hw; card PCH; device 3; } + pcm.analog { type hw; card PCH; } + ctl.analog { type hw; card PCH; } + + pcm.!default pcm.hdmi0 + ctl.!default ctl.hdmi0 + + +browser_kiosk_url: "https://{{ hostvars['glt-jitsi'].jitsi_meet_hostname }}/stream-ui/player.html#control={{ hostvars['glt-jitsi'].jitsi_meet_streamui.default_control_room }}&displayName={{ host_name }}" diff --git a/inventory/host_vars/glt-tarvos.yml b/inventory/host_vars/glt-tarvos.yml new file mode 100644 index 00000000..f7aadc59 --- /dev/null +++ b/inventory/host_vars/glt-tarvos.yml @@ -0,0 +1,56 @@ +--- +install_playbook: glt-browser-kiosk +install: + efi: no + disks: + primary: /dev/disk/by-id/ata-Samsung_SSD_850_PRO_128GB_S1SMNSAG201847J + system_lvm: + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: home + size: 80G + filesystem: ext4 + mountpoint: /home + kernel_cmdline: + - "consoleblank=0" + +network: + nameservers: + - 1.1.1.1 + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: enp0s31f6 + address: 10.73.7.20/16 + gateway: 10.73.0.254 + interfaces: + - *_network_primary_ + + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + + +browser_kiosk_xinit_commands_extra: | + xrandr --output HDMI-1 --mode 1920x1080 --rate 50 + +browser_kiosk_asound_conf: | + pcm.hdmi0 { type hw; card PCH; device 3; } + ctl.hdmi0 { type hw; card PCH; device 3; } + pcm.analog { type hw; card PCH; } + ctl.analog { type hw; card PCH; } + + pcm.!default pcm.hdmi0 + ctl.!default ctl.hdmi0 + + +browser_kiosk_url: "https://{{ hostvars['glt-jitsi'].jitsi_meet_hostname }}/stream-ui/player.html#control={{ hostvars['glt-jitsi'].jitsi_meet_streamui.default_control_room }}&displayName={{ host_name }}" diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index 16b5cce8..8bfab3f5 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -11,8 +11,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: enp35s0 - address: 192.168.28.20/24 - gateway: 192.168.28.254 + address: 10.73.7.7/16 + gateway: 10.73.0.254 interfaces: - *_network_primary_ - diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index a04d056e..1918e408 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -13,7 +13,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: 192.168.28.22/24 - gateway: 192.168.28.254 + address: 10.73.7.1/16 + gateway: 10.73.0.254 interfaces: - *_network_primary_ diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 5241ac56..958a36c3 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -148,6 +148,9 @@ env_group=spreadspace [linuxtage] glt-jitsi +glt-tarvos +glt-hpws-mini1 +glt-hpws-mini2 [linuxtage:children] glt-c3voc diff --git a/spreadspace/glt-browser-kiosk.yml b/spreadspace/glt-browser-kiosk.yml new file mode 100644 index 00000000..5f601bf3 --- /dev/null +++ b/spreadspace/glt-browser-kiosk.yml @@ -0,0 +1,15 @@ +--- +- name: Basic Setup + hosts: "{{ install_hostname }}" + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: core/cpu-microcode + +- name: Payload Setup + hosts: "{{ install_hostname }}" + roles: + - role: streaming/browser-kiosk -- cgit v1.2.3