rearrange some tasks
This commit is contained in:
parent
cbfa45c4f2
commit
70cec795de
976
Manual.html
976
Manual.html
File diff suppressed because it is too large
Load Diff
36
Manual.org
36
Manual.org
@ -706,7 +706,20 @@ The additional plugins to install can be set in the variable ~{{vdr_plugins}}~ i
|
|||||||
force: no
|
force: no
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
**** start vdr after network-online.target
|
||||||
|
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes
|
||||||
|
- name: systemd-drop-in | start vdr.service after network-online.target
|
||||||
|
template:
|
||||||
|
src: templates/systemd/network-online.j2
|
||||||
|
dest: /etc/systemd/system/vdr.service.d/network-online.conf
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
*** templates
|
*** templates
|
||||||
|
Start after network-online.target
|
||||||
|
#+BEGIN_SRC conf :tangle roles/vdr/templates/systemd/network-online.j2 :mkdirp yes
|
||||||
|
[Unit]
|
||||||
|
After=network-online.target
|
||||||
|
#+END_SRC
|
||||||
*** files
|
*** files
|
||||||
**** remote.conf
|
**** remote.conf
|
||||||
#+BEGIN_SRC conf :tangle roles/vdr/files/remote.conf :mkdirp yes :padline no
|
#+BEGIN_SRC conf :tangle roles/vdr/files/remote.conf :mkdirp yes :padline no
|
||||||
@ -1731,11 +1744,6 @@ first_run: False
|
|||||||
src: templates/systemd/vdr-environ.j2
|
src: templates/systemd/vdr-environ.j2
|
||||||
dest: /etc/systemd/system/vdr.service.d/load-environ.conf
|
dest: /etc/systemd/system/vdr.service.d/load-environ.conf
|
||||||
|
|
||||||
- name: systemd-drop-in | start vdr.service after network-online.target
|
|
||||||
template:
|
|
||||||
src: templates/systemd/network-online.j2
|
|
||||||
dest: /etc/systemd/system/vdr.service.d/network-online.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:
|
template:
|
||||||
src: templates/user@666.service.d/x-dependency.conf.j2
|
src: templates/user@666.service.d/x-dependency.conf.j2
|
||||||
@ -1996,12 +2004,6 @@ After=x@vt7.service
|
|||||||
Wants=x@vt7.service
|
Wants=x@vt7.service
|
||||||
#BindsTo=x@vt7.service
|
#BindsTo=x@vt7.service
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
***** .xinitrc
|
|
||||||
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.xinitrc.j2 :mkdirp yes :padline no
|
|
||||||
#!/bin/bash
|
|
||||||
{{ ansible_managed | comment }}
|
|
||||||
exec openbox-session
|
|
||||||
#+END_SRC
|
|
||||||
***** xorg.conf snippets
|
***** xorg.conf snippets
|
||||||
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2
|
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2
|
||||||
{{ ansible_managed | comment }}
|
{{ ansible_managed | comment }}
|
||||||
@ -2327,16 +2329,13 @@ EndSection
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
**** vdr
|
**** vdr
|
||||||
|
Set environment variables for user session on startup
|
||||||
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/systemd/vdr-environ.j2
|
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/systemd/vdr-environ.j2
|
||||||
[Service]
|
[Service]
|
||||||
Environment=XDG_RUNTIME_DIR=/run/user/{{ vdr.uid }}/
|
Environment=XDG_RUNTIME_DIR=/run/user/{{ vdr.uid }}/
|
||||||
EnvironmentFile=-/var/lib/vdr/.session-env
|
EnvironmentFile=-/var/lib/vdr/.session-env
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/systemd/network-online.j2
|
|
||||||
[Unit]
|
|
||||||
After=network-online.target
|
|
||||||
#+END_SRC
|
|
||||||
** yavdr-desktop
|
** yavdr-desktop
|
||||||
*** Tasks
|
*** Tasks
|
||||||
**** main.yml
|
**** main.yml
|
||||||
@ -2475,6 +2474,7 @@ After=network-online.target
|
|||||||
state: started
|
state: started
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
*** Templates
|
*** Templates
|
||||||
|
**** xorg configuration
|
||||||
***** .Xresources
|
***** .Xresources
|
||||||
|
|
||||||
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.Xresources.j2 :mkdirp yes :padline no
|
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.Xresources.j2 :mkdirp yes :padline no
|
||||||
@ -2495,6 +2495,12 @@ xterm*renderFont: true
|
|||||||
XTerm.vt100.faceName: xft:DejaVu Sans Mono:size=12:antialias=false
|
XTerm.vt100.faceName: xft:DejaVu Sans Mono:size=12:antialias=false
|
||||||
XTerm.vt100.font: 7x13
|
XTerm.vt100.font: 7x13
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
***** .xinitrc
|
||||||
|
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.xinitrc.j2 :mkdirp yes :padline no
|
||||||
|
#!/bin/bash
|
||||||
|
{{ ansible_managed | comment }}
|
||||||
|
exec openbox-session
|
||||||
|
#+END_SRC
|
||||||
**** openbox
|
**** openbox
|
||||||
***** autostart
|
***** autostart
|
||||||
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/openbox/autostart.j2 :mkdirp yes :shebang #!/bin/bash
|
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/openbox/autostart.j2 :mkdirp yes :shebang #!/bin/bash
|
||||||
|
@ -77,3 +77,7 @@
|
|||||||
group: '{{ vdr.group }}'
|
group: '{{ vdr.group }}'
|
||||||
mode: 0644
|
mode: 0644
|
||||||
force: no
|
force: no
|
||||||
|
- name: systemd-drop-in | start vdr.service after network-online.target
|
||||||
|
template:
|
||||||
|
src: templates/systemd/network-online.j2
|
||||||
|
dest: /etc/systemd/system/vdr.service.d/network-online.conf
|
||||||
|
@ -30,11 +30,6 @@
|
|||||||
src: templates/systemd/vdr-environ.j2
|
src: templates/systemd/vdr-environ.j2
|
||||||
dest: /etc/systemd/system/vdr.service.d/load-environ.conf
|
dest: /etc/systemd/system/vdr.service.d/load-environ.conf
|
||||||
|
|
||||||
- name: systemd-drop-in | start vdr.service after network-online.target
|
|
||||||
template:
|
|
||||||
src: templates/systemd/network-online.j2
|
|
||||||
dest: /etc/systemd/system/vdr.service.d/network-online.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:
|
template:
|
||||||
src: templates/user@666.service.d/x-dependency.conf.j2
|
src: templates/user@666.service.d/x-dependency.conf.j2
|
||||||
|
Loading…
Reference in New Issue
Block a user