From 440032137bda09030ad0a33ac40a7b32720fc840 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Wed, 22 Nov 2017 08:11:56 +0100 Subject: [PATCH] remove colon from name variables, fix org syntax error --- Manual.org | 15 ++-- roles/yavdr-xorg/tasks/detect-xorg.yml | 96 -------------------------- roles/yavdr-xorg/tasks/setup-xorg.yml | 10 +-- 3 files changed, 13 insertions(+), 108 deletions(-) diff --git a/Manual.org b/Manual.org index b641cd8..1a40075 100644 --- a/Manual.org +++ b/Manual.org @@ -1470,27 +1470,27 @@ b'\xde\xad\xbe\xef' - "/etc/systemd/system/vdr.service.d/" - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/" -- name: systemd-drop-in: add dependency to X-server for vdr.service +- name: systemd-drop-in | add dependency to X-server for vdr.service template: src: templates/vdr-xorg.conf dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf -- name: systemd-drop-in: start x@.service before xlogin@.service +- name: systemd-drop-in | start x@.service before xlogin@.service template: src: templates/x@service.d/xlogin.conf.j2 dest: /etc/systemd/system/x@.service.d/xlogin.conf -- name: systemd-drop-in: load environment file for vdr.service +- name: systemd-drop-in | load environment file for vdr.service template: src: templates/systemd/vdr-environ.j2 dest: /etc/systemd/system/vdr.service.d/load-environ.conf -- name: systemd-drop-in: user@{{ vdr.uid }}.service depends on x@vt7.service +- name: systemd-drop-in | user@{{ vdr.uid }}.service depends on x@vt7.service template: src: templates/user@666.service.d/x-dependency.conf.j2 dest: '/etc/systemd/system/user@{{ vdr.uid }}.service.d/x-dependency.conf' -- name: vdr-config: start softhddevice detached and set audio to pulseaudio +- name: vdr-config | start softhddevice detached and set audio to pulseaudio lineinfile: path: /etc/vdr/conf.avail/softhddevice.conf line: '{{ item }}' @@ -1615,9 +1615,10 @@ b'\xde\xad\xbe\xef' backup: yes when: - nvidia_detected - - #+END_SRC -,#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/desktop-session.yml :mkdirp yes :padline no +#+END_SRC + +#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/desktop-session.yml :mkdirp yes :padline no --- # file: roles/yavdr-xorg/tasks/desktop-session.yml diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml index b24c6b1..d38f67e 100644 --- a/roles/yavdr-xorg/tasks/detect-xorg.yml +++ b/roles/yavdr-xorg/tasks/detect-xorg.yml @@ -78,99 +78,3 @@ backup: yes when: - nvidia_detected - - #+END_SRC - -#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/desktop-session.yml :mkdirp yes :padline no ---- -# file: roles/yavdr-xorg/tasks/desktop-session.yml - -- 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' - mode: 0755 - owner: '{{ vdr.user }}' - group: '{{ vdr.group }}' - -- name: expand template for openbox autostart - template: - src: 'templates/openbox/autostart.j2' - dest: '{{ vdr.home }}/.config/openbox/autostart' - mode: 0755 - owner: '{{ vdr.user }}' - group: '{{ vdr.group }}' - -- name: expand rc.xml for openbox - template: - src: 'templates/openbox/rc.xml.j2' - dest: '{{ vdr.home }}/.config/openbox/rc.xml' - mode: 0644 - owner: '{{ vdr.user }}' - group: '{{ vdr.group }}' - -- name: create yavdr-desktop.target for the user session - template: - src: 'templates/systemd/user/yavdr-desktop.target.j2' - dest: '{{ vdr.home }}/.config/systemd/user/yavdr-desktop.target' - mode: 0644 - 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: 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' - -- name: create wm-exit.service for the session - template: - src: roles/yavdr-xorg/templates/systemd/user/wm-exit.service.j2 - dest: '{{ vdr.home }}/.config/systemd/user/wm-exit.service' - -- name: create detect-second-display.service for the session - template: - src: templates/systemd/user/detect-second-display.service.j2 - dest: '{{ vdr.home }}/.config/systemd/user/detect-second-display.service' - -- name: create openbox-second.service for the session - template: - src: templates/systemd/user/openbox-second.service.j2 - dest: '{{ vdr.home }}/.config/systemd/user/openbox-second.service' - -- name: create osd2web.service for the session - template: - src: templates/systemd/user/osd2web.service.j2 - dest: '{{ vdr.home }}/.config/systemd/user/osd2web.service' - -- name: link /usr/bin/start-desktop to /var/lib/vdr/plugins/desktop/starter - file: - src: /usr/bin/start-desktop - dest: /var/lib/vdr/plugins/desktop/starter - state: link - -- name: enable and start xlogin for the vdr user - systemd: - daemon_reload: yes - name: 'xlogin@{{ vdr.user }}' - enabled: yes - state: started diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml index 4656560..feeb77d 100644 --- a/roles/yavdr-xorg/tasks/setup-xorg.yml +++ b/roles/yavdr-xorg/tasks/setup-xorg.yml @@ -9,27 +9,27 @@ - "/etc/systemd/system/vdr.service.d/" - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/" -- name: systemd-drop-in: add dependency to X-server for vdr.service +- name: systemd-drop-in | add dependency to X-server for vdr.service template: src: templates/vdr-xorg.conf dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf -- name: systemd-drop-in: start x@.service before xlogin@.service +- name: systemd-drop-in | start x@.service before xlogin@.service template: src: templates/x@service.d/xlogin.conf.j2 dest: /etc/systemd/system/x@.service.d/xlogin.conf -- name: systemd-drop-in: load environment file for vdr.service +- name: systemd-drop-in | load environment file for vdr.service template: src: templates/systemd/vdr-environ.j2 dest: /etc/systemd/system/vdr.service.d/load-environ.conf -- name: systemd-drop-in: user@{{ vdr.uid }}.service depends on x@vt7.service +- name: systemd-drop-in | user@{{ vdr.uid }}.service depends on x@vt7.service template: src: templates/user@666.service.d/x-dependency.conf.j2 dest: '/etc/systemd/system/user@{{ vdr.uid }}.service.d/x-dependency.conf' -- name: vdr-config: start softhddevice detached and set audio to pulseaudio +- name: vdr-config | start softhddevice detached and set audio to pulseaudio lineinfile: path: /etc/vdr/conf.avail/softhddevice.conf line: '{{ item }}'