start reorganizing main.yml in roles

roles/yavdr-xorg/tasks/detect-xorg.yml

@@ -11,6 +11,26 @@
     src: "templates/xorg-verbose.conf.j2"
     dest: "/etc/X11/xorg-verbose.conf"
 
+- name: Stop VDR
+  systemd:
+    name: vdr.service
+    state: stopped
+    enabled: yes
+  notify: ['Start VDR']
+
+
+- name: Stop xlogin
+  systemd:
+    name: xlogin@vdr.service
+    state: stopped
+    enabled: yes
+
+- name: Stop x
+  systemd:
+    name: x@vt7.service
+    state: stopped
+
+
 - name: "start x-verbose@.service"
   systemd:
     name: "x-verbose@vt7.service"
@@ -39,3 +59,21 @@
     state: stopped
     enabled: false
     masked: true
+
+# IDEA: use hooks or requirements instead
+# TODO: expand template for xorg.conf (or snippets)
+#       with respect for the available graphics card driver
+#       nvidia, noveau, intel, radeon
+
+- name: create xorg.conf (for nvidia driver)
+  template:
+    src: templates/xorg.conf.j2
+    dest: /etc/X11/xorg.conf
+    backup: yes
+
+- name: enable and start xlogin for the user vdr
+  systemd:
+    daemon_reload: yes
+    name: 'xlogin@{{ vdr.user }}'
+    enabled: yes
+    state: started

roles/yavdr-xorg/tasks/main.yml

@@ -1,82 +1,5 @@
 ---
 # file: roles/yavdr-xorg/tasks/main.yml
-
-# IDEA: use hooks or requirements instead
-- name: Stop VDR
-  systemd:
-    name: vdr.service
-    state: stopped
-    enabled: yes
-  notify: ['Start VDR']
-
-- name: create directory /etc/systemd/system/vdr.service.d/
-  file:
-    dest: /etc/systemd/system/vdr.service.d/
-    state: directory
-
-- name: add dependency to X-server for vdr.service using a drop-in
-  template:
-    src: templates/vdr-xorg.conf
-    dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf
-
-- name: load environment file for vdr.service
-  template:
-    src: templates/systemd/vdr-environ.j2
-    dest: /etc/systemd/system/vdr.service.d/load-environ.conf
-
-- name: set a login shell for the user vdr
-  user:
-      name: '{{ vdr.user }}'
-      shell: '/bin/bash'
-      state: present
-      uid: '{{ vdr.uid }}'
-      groups: '{{ vdr.group }}'
-      append: yes
-
-- name: install packages for xorg
-  apt:
-    name: '{{ item }}'
-    state: present
-  with_items:
-    - xorg
-    - xserver-xorg-video-all
-    - xserver-xorg-input-all
-    - xlogin
-    - xterm
-    - openbox
-    - tmux
-    - kiosk-browser
-    - read-edid
-    #- yavdr-xorg
-
-- name: Stop xlogin
-  systemd:
-    name: xlogin@vdr.service
-    state: stopped
-    enabled: yes
-
-- name: Stop x
-  systemd:
-    name: x@vt7.service
-    state: stopped
-
-- include: detect-xorg.yml
-
-# TODO: expand template for xorg.conf (or snippets)
-#       with respect for the available graphics card driver
-#       nvidia, noveau, intel, radeon
-
-- name: create xorg.conf (for nvidia driver)
-  template:
-    src: templates/xorg.conf.j2
-    dest: /etc/X11/xorg.conf
-    backup: yes
-
+- include: setup-xorg.yml tags:install,update
 - include: desktop-session.yml
-
-- name: enable and start xlogin for the user vdr
-  systemd:
-    daemon_reload: yes
-    name: 'xlogin@{{ vdr.user }}'
-    enabled: yes
-    state: started
+- include: detect-xorg.yml tags=xorg:detect,install

roles/yavdr-xorg/tasks/setup-xorg.yml

@@ -0,0 +1,40 @@
+- name: create directory /etc/systemd/system/vdr.service.d/
+  file:
+    dest: /etc/systemd/system/vdr.service.d/
+    state: directory
+
+- name: add dependency to X-server for vdr.service using a drop-in
+  template:
+    src: templates/vdr-xorg.conf
+    dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf
+
+- name: load environment file for vdr.service
+  template:
+    src: templates/systemd/vdr-environ.j2
+    dest: /etc/systemd/system/vdr.service.d/load-environ.conf
+
+- name: set a login shell for the user vdr
+  user:
+      name: '{{ vdr.user }}'
+      shell: '/bin/bash'
+      state: present
+      uid: '{{ vdr.uid }}'
+      groups: '{{ vdr.group }}'
+      append: yes
+
+- name: install packages for xorg
+  apt:
+    name: '{{ item }}'
+    state: present
+  with_items:
+    - xorg
+    - xserver-xorg-video-all
+    - xserver-xorg-input-all
+    - xlogin
+    - xterm
+    - openbox
+    - tmux
+    - kiosk-browser
+    - read-edid
+    - python3-yavdrfrontend
+    #- yavdr-xorg

roles/yavdr-xorg/templates/openbox/autostart.j2

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # forward environment variables to an environment file and the systemd user session
 env | grep "DISPLAY\|DBUS_SESSION_BUS_ADDRESS\|XDG_RUNTIME_DIR" > ~/.session-env
 systemctl --user import-environment DISPLAY XAUTHORITY XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS

roles/yavdr-xorg/templates/systemd/vdr-environ.j2

@@ -1,3 +1,2 @@
-
 [Service]
 EnvironmentFile=-/var/lib/vdr/.session-env

roles/yavdr-xorg/templates/xorg-verbose.conf.j2

@@ -1,4 +1,3 @@
-
 Section "Device"
         Identifier "nvidia"
         Driver  "nvidia"

roles/yavdr-xorg/templates/xorg.conf.j2

@@ -1,4 +1,3 @@
-
 {{ ansible_managed_file | comment }}
 
 Section "ServerLayout"