[ansible/video] Detect WAYLAND_DISPLAY and dynamic DISPLAY

ansible/roles/ovos_installer/tasks/docker/composer.yml

@@ -21,7 +21,7 @@
   tags:
     - always
 
-- name: Remove DISPLAY variable if EGLFS is used
+- name: Remove DISPLAY and WAYLAND_DISPLAY variables if EGLFS is used
   ansible.builtin.lineinfile:
     path: "{{ _composition_directory }}/docker-compose.gui.yml"
     search_string: "DISPLAY"

ansible/roles/ovos_installer/tasks/video.yml

@@ -22,3 +22,37 @@
     group: "{{ ovos_installer_group }}"
     mode: "0600"
   when: "'Raspberry Pi 5' in ovos_installer_raspberrypi and ovos_installer_display_server == 'N/A'"
+
+- name: Block DISPLAY server & Wayland socket
+  when: ovos_installer_display_server != "N/A"
+  block:
+    # The find module doesn't support the socket type and it could generate a
+    # "permission denied" error depending the content of /run/user/UID
+    - name: Check for wayland socket
+      ansible.builtin.shell:
+        cmd: |
+          set -e -o pipefail
+          ls -1 /run/user/{{ ovos_installer_uid }} | grep -E '^wayland-[0-9]$'
+        executable: /bin/bash
+      register: _ovos_wayland_display
+      changed_when: false
+      when: ovos_installer_display_server == 'wayland'
+
+    - name: Set ovos_installer_wayland_display fact
+      ansible.builtin.set_fact:
+        ovos_installer_wayland_display: "{{ _ovos_wayland_display.stdout }}"
+      when: _ovos_wayland_display is defined and _ovos_wayland_display.stdout | length > 0
+
+    - name: Detect DISPLAY server number
+      ansible.builtin.shell:
+        cmd: |
+          set -e -o pipefail
+          sed -zn 's/^DISPLAY=//p' /proc/*/environ | sort -zu | tr '\0' '\n'
+        executable: /bin/bash
+      register: _ovos_display_server_number
+      changed_when: false
+
+    - name: Set ovos_installer_display_server_number fact
+      ansible.builtin.set_fact:
+        ovos_installer_display_server_number: "{{ _ovos_display_server_number.stdout }}"
+      when: _ovos_display_server_number.stdout | length > 0

ansible/roles/ovos_installer/templates/docker/env.j2

@@ -1,6 +1,6 @@
 #jinja2: lstrip_blocks: True
 {% if ovos_installer_display_server != 'N/A' %}
-DISPLAY=:0
+DISPLAY={{ ovos_installer_display_server_number if ovos_installer_display_server_number is defined else ':0' }}
 {% endif %}
 {% if 'gpio' in getent_group %}
 GPIO_GID={{ getent_group['gpio'][1] }}
@@ -53,4 +53,7 @@ VOICE_SAT_PASSWORD={{ ovos_installer_satellite_password }}
 VOICE_SAT_HOST=ws://{{ ovos_installer_listener_host }}
 VOICE_SAT_PORT={{ ovos_installer_listener_port | default(5678) }}
 {% endif %}
+{% if ovos_installer_display_server != 'N/A' %}
+WAYLAND_DISPLAY={{ ovos_installer_wayland_display if ovos_installer_wayland_display is defined else 'wayland-0' }}
+{% endif %}
 XDG_RUNTIME_DIR=/run/user/{{ ovos_installer_uid }}