From be1ec1504875594dfde9265cbeb3e9fdc07f0dc9 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 4 Mar 2024 16:31:28 +0100 Subject: info-beamer: configure wifi country code to enable channel 12 and 13 --- inventory/group_vars/ele-infobeamer/vars.yml | 6 +++++- roles/info-beamer/config/defaults/main.yml | 1 + roles/info-beamer/config/tasks/main.yml | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/ele-infobeamer/vars.yml b/inventory/group_vars/ele-infobeamer/vars.yml index b6990cef..9aabdfd8 100644 --- a/inventory/group_vars/ele-infobeamer/vars.yml +++ b/inventory/group_vars/ele-infobeamer/vars.yml @@ -3,7 +3,11 @@ info_beamer_hdmi_resolution: "{{ info_beamer_hdmi_resolutions['1080p60'] }}" info_beamer_audio_target: "hdmi" info_beamer_ssh_keys: "{{ ssh_keys_root }}" -info_beamer_wireless: "{{ network_zones.infoscreens.wifi }}" +info_beamer_wireless: + ssid: "{{ network_zones.infoscreens.wifi.ssid }}" + key: "{{ network_zones.infoscreens.wifi.key }}" + country: AT + info_beamer_prefer_wired: true info_beamer_branding_logo: "{{ global_files_dir }}/dan/elevate/info-beamer/branding.ppm" diff --git a/roles/info-beamer/config/defaults/main.yml b/roles/info-beamer/config/defaults/main.yml index fecc8bf4..da9f6693 100644 --- a/roles/info-beamer/config/defaults/main.yml +++ b/roles/info-beamer/config/defaults/main.yml @@ -65,6 +65,7 @@ info_beamer_feature_flags: # info_beamer_wireless: # ssid: "Infoscreens" # key: "very-secret" +# country: "AT" ## path to file will be installed using 'copy' module # info_beamer_branding_logo: "" diff --git a/roles/info-beamer/config/tasks/main.yml b/roles/info-beamer/config/tasks/main.yml index 734f6842..e590da16 100644 --- a/roles/info-beamer/config/tasks/main.yml +++ b/roles/info-beamer/config/tasks/main.yml @@ -47,6 +47,13 @@ {{ info_beamer_wireless.key }} dest: "{{ info_beamer_base_path }}/config/wireless" +- name: configure wireless network interface + when: "info_beamer_wireless is defined and 'country' in info_beamer_wireless" + copy: + content: |- + {{ info_beamer_wireless.country }} + dest: "{{ info_beamer_base_path }}/config/wifi-country" + - name: enable info-beamer feature flags loop: "{{ info_beamer_feature_flags | dict2items }}" loop_control: -- cgit v1.2.3