frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rearrange order of xorg tasks

Browse Source
This commit is contained in:
Alexander Grothe
2017-07-30 23:19:35 +02:00
parent 483f9e2878
commit 2167d28123
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Manual.org
View File

@@ -1394,8 +1394,8 @@ b'\xde\xad\xbe\xef'
--- ---
# file: roles/yavdr-xorg/tasks/main.yml # file: roles/yavdr-xorg/tasks/main.yml
- include: setup-xorg.yml tags=install,update - include: setup-xorg.yml tags=install,update
- include: desktop-session.yml tags=install,update
- include: detect-xorg.yml tags=xorg:detect,install - include: detect-xorg.yml tags=xorg:detect,install
- include: desktop-session.yml tags=install,update
#+END_SRC #+END_SRC
**** setup-xorg **** setup-xorg
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no
@@ -1516,13 +1516,6 @@ b'\xde\xad\xbe\xef'
src: templates/xorg.conf.j2 src: templates/xorg.conf.j2
dest: /etc/X11/xorg.conf dest: /etc/X11/xorg.conf
backup: yes backup: yes
- name: enable and start xlogin for the user vdr
systemd:
daemon_reload: yes
name: 'xlogin@{{ vdr.user }}'
enabled: yes
state: started
#+END_SRC #+END_SRC
**** desktop-session **** desktop-session
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/desktop-session.yml :mkdirp yes :padline no #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/desktop-session.yml :mkdirp yes :padline no
@@ -1619,6 +1612,12 @@ b'\xde\xad\xbe\xef'
dest: /var/lib/vdr/plugins/desktop/starter dest: /var/lib/vdr/plugins/desktop/starter
state: link state: link
- name: enable and start xlogin for the user vdr
systemd:
daemon_reload: yes
name: 'xlogin@{{ vdr.user }}'
enabled: yes
state: started
#+END_SRC #+END_SRC
*** templates *** templates
**** xorg **** xorg

6
roles/yavdr-xorg/tasks/desktop-session.yml
View File

@@ -91,3 +91,9 @@
dest: /var/lib/vdr/plugins/desktop/starter dest: /var/lib/vdr/plugins/desktop/starter
state: link state: link
- name: enable and start xlogin for the user vdr
systemd:
daemon_reload: yes
name: 'xlogin@{{ vdr.user }}'
enabled: yes
state: started

7
roles/yavdr-xorg/tasks/detect-xorg.yml
View File

@@ -70,10 +70,3 @@
src: templates/xorg.conf.j2 src: templates/xorg.conf.j2
dest: /etc/X11/xorg.conf dest: /etc/X11/xorg.conf
backup: yes backup: yes
- name: enable and start xlogin for the user vdr
systemd:
daemon_reload: yes
name: 'xlogin@{{ vdr.user }}'
enabled: yes
state: started

2
roles/yavdr-xorg/tasks/main.yml
View File

@@ -1,5 +1,5 @@
--- ---
# file: roles/yavdr-xorg/tasks/main.yml # file: roles/yavdr-xorg/tasks/main.yml
- include: setup-xorg.yml tags=install,update - include: setup-xorg.yml tags=install,update
- include: desktop-session.yml tags=install,update
- include: detect-xorg.yml tags=xorg:detect,install - include: detect-xorg.yml tags=xorg:detect,install
- include: desktop-session.yml tags=install,update