fix padline option for source blocks

roles/yavdr-xorg/tasks/main.yml

@@ -1,7 +1,6 @@
 ---
 # file: roles/yavdr-xorg/tasks/main.yml
 
-
 # TODO: use hooks or requirements instead
 - name: Stop VDR
   systemd:
@@ -32,6 +31,8 @@
     - xlogin
     - xterm
     - openbox
+    - tmux
+    - kiosk-browser
     #- yavdr-xorg
 
 - name: "stop x@vt7.service"
@@ -41,7 +42,7 @@
 
 - name: "expand template for x-verbose@.service"
   template:
-    src: "templates/x-verbose@.service.j2"
+    src: "templates/systemd/system/x-verbose@.service.j2"
     dest: "/etc/systemd/system/x-verbose@.service"
 
 - name: "start x-verbose@.service"
@@ -79,36 +80,30 @@
     - '{{ vdr.home }}/.config/systemd/user'
     - '{{ vdr.home }}/.config/openbox/'
 
-### TODO: move to yavdr-xorg package? ###
 - name: create folder for customizations of vdr.service
   file:
     state: directory
     dest: /etc/systemd/system/vdr.service.d
     mode: '0775'
 
-- name: create folder for systemd user configuration
-  file:
-    state: directory
-    dest: '{{ vdr.home }}/.config/systemd/user'
-    mode: '0775'
-    owner: '{{ vdr.user }}'
-    group: '{{ vdr.group }}'
-
-- name: create folder for openbox configuration
-  file:
-    state: directory
-    dest: '{{ vdr.home }}/.config/openbox'
-    mode: '0775'
-    owner: '{{ vdr.user }}'
-    group: '{{ vdr.group }}'
-
 - 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/
-### END TODO ###
 
-- name: create .xinitrc for vdr user
+- name: create folders for user configuration files
+  file:
+    state: directory
+    dest: '{{ item }}'
+    mode: '0775'
+    owner: '{{ vdr.user }}'
+    group: '{{ vdr.group }}'
+  with_items:
+    - '{{ vdr.home }}/.config/systemd/user'
+    - '{{ vdr.home }}/.config/openbox'
+    - '{{ vdr.home }}/.config/pulse'
+
+- name: expand template for .xinitrc for vdr user
   template:
       src: 'templates/.xinitrc.j2'
       dest: '{{ vdr.home }}/.xinitrc'
@@ -116,9 +111,9 @@
       owner: '{{ vdr.user }}'
       group: '{{ vdr.group }}'
 
-- name: populate autostart for openbox
+- name: expand template for openbox autostart
   template:
-      src: 'templates/autostart.j2'
+      src: 'templates/openbox/autostart.j2'
       dest: '{{ vdr.home }}/.config/openbox/autostart'
       mode: 0755
       owner: '{{ vdr.user }}'
@@ -126,20 +121,29 @@
 
 - name: expand rc.xml for openbox
   template:
-      src: 'templates/openbox_rc.xml.j2'
+      src: 'templates/openbox/rc.xml.j2'
       dest: '{{ vdr.home }}/.config/openbox/rc.xml'
       mode: 0755
       owner: '{{ vdr.user }}'
       group: '{{ vdr.group }}'
 
-- name: create yavdr.target for the user session
+- name: create yavdr-desktop.target for the user session
   template:
-      src: 'templates/yavdr-desktop.target.j2'
+      src: 'templates/systemd/user/yavdr-desktop.target.j2'
       dest: '{{ vdr.home }}/.config/systemd/user/yavdr-desktop.target'
       mode: 0755
       owner: '{{ vdr.user }}'
       group: '{{ vdr.group }}'
 
+- name: disable pulseaudio autospawning
+  lineinfile:
+    path: '{{ vdr.home }}/.config/pulse/client.conf'
+    line: 'autospawn = no'
+    create: yes
+    state: present
+    owner: '{{ vdr.user }}'
+    group: '{{ vdr.group }}'
+
 - name: set a login shell for the user vdr
   user:
       name: '{{ vdr.user }}'
@@ -149,6 +153,11 @@
       groups: '{{ vdr.group }}'
       append: yes
 
+- name: create tmux.service for the session
+  template:
+    src: roles/yavdr-xorg/templates/systemd/user/tmux.service.j2
+    dest: '{{ vdr.home }}/.config/systemd/user/tmux.service'
+
 # TODO: run xorg-debug and parse xrandr output
 # TODO: expand template for xorg.conf (or snippets)
 #       with respect for the available graphics card driver