From 9862189d58756677fce6e248121ba323ac9f79c7 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 9 Oct 2022 15:18:12 +0200 Subject: upgrade ele-dolmetsch raspis --- dan/ele-dolmetsch-raspi.yml | 20 +++++++++++++- inventory/group_vars/ele-dolmetsch-raspi/vars.yml | 23 +++++++++++++++- inventory/host_vars/ch-mclr.yml | 2 ++ roles/raspios/image/defaults/main.yml | 2 +- roles/raspios/image/templates/firstrun.sh.j2 | 2 +- roles/streaming/dolmetsch-raspi/tasks/main.yml | 32 ++--------------------- 6 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dan/ele-dolmetsch-raspi.yml b/dan/ele-dolmetsch-raspi.yml index f4008892..cbb2ca58 100644 --- a/dan/ele-dolmetsch-raspi.yml +++ b/dan/ele-dolmetsch-raspi.yml @@ -2,7 +2,7 @@ - name: Basic Setup hosts: "{{ install_hostname }}" roles: - - role: slim/raspbian + - role: apt-repo/base - role: core/base - role: core/sshd/base - role: core/zsh @@ -11,3 +11,21 @@ hosts: "{{ install_hostname }}" roles: - role: streaming/dolmetsch-raspi + post_tasks: + - when: inventory_hostname == "ele-dol-raspi0" + loop: + - rtp-recv.service + - dolmetschctld.service + systemd: + name: "{{ item }}" + state: started + enabled: yes + + - when: inventory_hostname == "ele-dol-raspi1" + loop: + - rtp-send.service + - dolmetschctl.service + systemd: + name: "{{ item }}" + state: started + enabled: yes diff --git a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml index e987b1ab..36c93445 100644 --- a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml +++ b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml @@ -1,7 +1,28 @@ --- install_playbook: ele-dolmetsch-raspi -raspbian_disable_audio: false +raspios_variant: lite +raspios_arch: arm64 + +network: + nameservers: "{{ network_zones.mixer.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eth0 + address: "{{ network_zones.mixer.prefix | ansible.utils.ipaddr(network_zones.mixer.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.mixer.gateway }}" + interfaces: + - *_network_primary_ + +raspios_boot_config: + - regexp: '^#?dtparam=audio=' + line: 'dtparam=audio=on' + - regexp: '^#?dtoverlay=disable-bt' + line: 'dtoverlay=disable-bt' + - regexp: '^#?dtoverlay=disable-wifi' + line: 'dtoverlay=disable-wifi' + +base_entropy_generator: rngd base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" diff --git a/inventory/host_vars/ch-mclr.yml b/inventory/host_vars/ch-mclr.yml index 457ee062..50a8d58d 100644 --- a/inventory/host_vars/ch-mclr.yml +++ b/inventory/host_vars/ch-mclr.yml @@ -15,6 +15,8 @@ network: raspios_boot_config: - regexp: '^#?hdmi_enable_4kp60=1' line: 'hdmi_enable_4kp60=1' + - regexp: '^#?dtoverlay=disable-wifi' + line: 'dtoverlay=disable-wifi' base_entropy_generator: rngd diff --git a/roles/raspios/image/defaults/main.yml b/roles/raspios/image/defaults/main.yml index dc9a25d0..3f6ab3a3 100644 --- a/roles/raspios/image/defaults/main.yml +++ b/roles/raspios/image/defaults/main.yml @@ -6,7 +6,7 @@ raspios_download_dir: "{{ global_cache_dir }}/raspios" raspios_output_dir: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/raspios" -raspios_keep_boot_dir_mounted: False +raspios_keep_boot_dir_mounted: no # raspios_boot_config: # - regexp: '^#dtparam=i2c_vc' diff --git a/roles/raspios/image/templates/firstrun.sh.j2 b/roles/raspios/image/templates/firstrun.sh.j2 index a109617b..3166b974 100644 --- a/roles/raspios/image/templates/firstrun.sh.j2 +++ b/roles/raspios/image/templates/firstrun.sh.j2 @@ -8,7 +8,7 @@ raspi-config nonint do_change_timezone "{{ raspios_timezone }}" raspi-config nonint do_configure_keyboard "{{ raspios_keyboard_layout }}" {# 0 -> predictable interface names, 1 -> legacy (eth0...) #} -raspi-config nonint do_net_names 0 +raspi-config nonint do_net_names 1 {% if not (install_dhcp | default(false)) %} cat <> /etc/dhcpcd.conf diff --git a/roles/streaming/dolmetsch-raspi/tasks/main.yml b/roles/streaming/dolmetsch-raspi/tasks/main.yml index c525c3cd..21d841fe 100644 --- a/roles/streaming/dolmetsch-raspi/tasks/main.yml +++ b/roles/streaming/dolmetsch-raspi/tasks/main.yml @@ -10,35 +10,7 @@ - git - libasound2-dev - telnet - -- name: download golang tarball - get_url: - url: "https://dl.google.com/go/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz" - dest: "/usr/local/src/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz" - checksum: "{{ dolmetsch_raspi_golang_checksum }}" - -- name: check current goloang version (if any) - command: /usr/local/go/bin/go version - ignore_errors: yes - check_mode: no - changed_when: false - register: golang_version - -- name: update golang installation - when: golang_version is failed or golang_version.stdout != ("go version go" + dolmetsch_raspi_golang_version + " linux/arm") - block: - - name: remove old golang installation - file: - path: /usr/local/go - state: absent - - - name: extract the golang tarball - environment: ### TODO: remove once this lands in ansible: https://github.com/ansible/ansible/pull/76542 - LANGUAGE: en_US.utf8 - unarchive: - src: "/usr/local/src/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz" - dest: /usr/local - copy: no + - golang-go - name: clone dolmetschctl repo git: @@ -49,7 +21,7 @@ loop: - dolmetschctl - dolmetschctld - command: "/usr/local/go/bin/go build -o {{ item }} ./cmd/{{ item }}" + command: "go build -o {{ item }} ./cmd/{{ item }}" args: chdir: /opt/dolmetschctl creates: "/opt/dolmetschctl/{{ item }}" -- cgit v1.2.3