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

Add frontend script to session, install vdr-plugin-desktop

Browse Source
This commit is contained in:
Alexander Grothe
2017-07-30 21:55:48 +02:00
parent 9c839f156d
commit b9082eadc9
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Manual.org
View File

@@ -1389,6 +1389,7 @@ b'\xde\xad\xbe\xef'
#+END_SRC #+END_SRC
*** default variables *** default variables
*** tasks *** tasks
**** main
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/main.yml :mkdirp yes :padline no #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/main.yml :mkdirp yes :padline no
--- ---
# file: roles/yavdr-xorg/tasks/main.yml # file: roles/yavdr-xorg/tasks/main.yml
@@ -1396,7 +1397,7 @@ b'\xde\xad\xbe\xef'
- include: desktop-session.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
#+END_SRC #+END_SRC
**** 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
- name: create directory /etc/systemd/system/vdr.service.d/ - name: create directory /etc/systemd/system/vdr.service.d/
file: file:
@@ -1438,9 +1439,10 @@ b'\xde\xad\xbe\xef'
- read-edid - read-edid
- python3-dbus2vdr - python3-dbus2vdr
- python3-yavdrfrontend - python3-yavdrfrontend
- vdr-plugin-desktop
#- yavdr-xorg #- yavdr-xorg
#+END_SRC #+END_SRC
**** detect-xorg
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/detect-xorg.yml :mkdirp yes :padline no #+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/detect-xorg.yml :mkdirp yes :padline no
--- ---
# file: roles/yavdr-xorg/tasks/detect-xorg.yml # file: roles/yavdr-xorg/tasks/detect-xorg.yml
@@ -1522,7 +1524,7 @@ b'\xde\xad\xbe\xef'
enabled: yes enabled: yes
state: started state: started
#+END_SRC #+END_SRC
**** 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
--- ---
# file: roles/yavdr-xorg/tasks/desktop-session.yml # file: roles/yavdr-xorg/tasks/desktop-session.yml
@@ -1591,7 +1593,6 @@ b'\xde\xad\xbe\xef'
owner: '{{ vdr.user }}' owner: '{{ vdr.user }}'
group: '{{ vdr.group }}' group: '{{ vdr.group }}'
- name: create tmux.service for the session - name: create tmux.service for the session
template: template:
src: roles/yavdr-xorg/templates/systemd/user/tmux.service.j2 src: roles/yavdr-xorg/templates/systemd/user/tmux.service.j2
@@ -1611,6 +1612,13 @@ b'\xde\xad\xbe\xef'
template: template:
src: templates/systemd/user/osd2web.service.j2 src: templates/systemd/user/osd2web.service.j2
dest: '{{ vdr.home }}/.config/systemd/user/osd2web.service' 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
#+END_SRC #+END_SRC
*** templates *** templates
**** xorg **** xorg
@@ -2042,7 +2050,10 @@ WantedBy=default.target
env | grep "DISPLAY\|DBUS_SESSION_BUS_ADDRESS\|XDG_RUNTIME_DIR" > ~/.session-env 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 systemctl --user import-environment DISPLAY XAUTHORITY XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
enabled_services=("tmux.service" "detect-second-display.service" "openbox-second.service" "osd2web.service") enabled_services=(
"tmux.service" "detect-second-display.service"
"openbox-second.service" "osd2web.service"
"yavdr-frontend.service")
disabled_services=() disabled_services=()
# enable configured services for the user session # enable configured services for the user session

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

@@ -65,7 +65,6 @@
owner: '{{ vdr.user }}' owner: '{{ vdr.user }}'
group: '{{ vdr.group }}' group: '{{ vdr.group }}'
- name: create tmux.service for the session - name: create tmux.service for the session
template: template:
src: roles/yavdr-xorg/templates/systemd/user/tmux.service.j2 src: roles/yavdr-xorg/templates/systemd/user/tmux.service.j2

1
roles/yavdr-xorg/tasks/setup-xorg.yml
View File

@@ -38,4 +38,5 @@
- read-edid - read-edid
- python3-dbus2vdr - python3-dbus2vdr
- python3-yavdrfrontend - python3-yavdrfrontend
- vdr-plugin-desktop
#- yavdr-xorg #- yavdr-xorg

5
roles/yavdr-xorg/templates/openbox/autostart.j2
View File

@@ -3,7 +3,10 @@
env | grep "DISPLAY\|DBUS_SESSION_BUS_ADDRESS\|XDG_RUNTIME_DIR" > ~/.session-env 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 systemctl --user import-environment DISPLAY XAUTHORITY XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
enabled_services=("tmux.service" "detect-second-display.service" "openbox-second.service" "osd2web.service") enabled_services=(
"tmux.service" "detect-second-display.service"
"openbox-second.service" "osd2web.service"
"yavdr-frontend.service")
disabled_services=() disabled_services=()
# enable configured services for the user session # enable configured services for the user session