From 8133f7e7865832588fd8d0c04a52486ca22dd521 Mon Sep 17 00:00:00 2001
From: Alexander Grothe <seahawk1986@gmx.de>
Date: Sun, 16 Jul 2017 09:17:39 +0200
Subject: [PATCH] Let yavdr-remote always install eventlircd, activate lircd
 for vdr

---
 Manual.org                        | 14 ++++++++++----
 group_vars/all                    |  1 -
 roles/yavdr-remote/tasks/main.yml | 10 ++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Manual.org b/Manual.org
index 2a406df..32e55ea 100644
--- a/Manual.org
+++ b/Manual.org
@@ -925,15 +925,11 @@ install_avahi: true
   apt:
     name: eventlircd
     state: present
-  when:
-      install_eventlircd is defined and install_eventlircd
 
 - name: apt | install lirc
   apt:
     name: lircd
     state: present
-  when:
-    - install_lircd is defined and install_lircd
 
 - name: stop, mask and disable lircd.socket and lircd.service # (the default lirc configuration conflicts with eventlircd)
   systemd:
@@ -946,6 +942,12 @@ install_avahi: true
     - lircd.socket
   ignore_errors: yes
 
+- name: configure vdr to read from a lircd-compatible socket
+  template:
+    src: templates/03-vdr-lirc.conf.j2
+    dest: /etc/vdr/conf.d/03-vdr-lirc.conf
+  notify: notify: ['Restart VDR']
+
 # TODO: upload lircd2uinput package to PPA
 #- name: install lircd2uinput
 #  tag: install
@@ -956,6 +958,10 @@ install_avahi: true
 #      install_eventlircd is defined and install_eventlircd
 #+END_SRC
 *** templates
+#+BEGIN_SRC :tangle roles/yavdr-remote/templates/03-vdr-lircd.conf.j2 :mkdirp yes :padline no
+[vdr]
+--lirc=/var/run/lirc/lircd
+#+END_SRC
 *** files
 
 ** pulseaudio
diff --git a/group_vars/all b/group_vars/all
index cc6b590..47dea8e 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -31,7 +31,6 @@ vdr_plugins:
   - vdr-plugin-markad
   - vdr-plugin-restfulapi
   - vdr-plugin-softhddevice-vpp
-
 # dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled
 media_dirs:
   audio: /srv/audio
diff --git a/roles/yavdr-remote/tasks/main.yml b/roles/yavdr-remote/tasks/main.yml
index cfe20ed..a88fb89 100644
--- a/roles/yavdr-remote/tasks/main.yml
+++ b/roles/yavdr-remote/tasks/main.yml
@@ -10,15 +10,11 @@
   apt:
     name: eventlircd
     state: present
-  when:
-      install_eventlircd is defined and install_eventlircd
 
 - name: apt | install lirc
   apt:
     name: lircd
     state: present
-  when:
-    - install_lircd is defined and install_lircd
 
 - name: stop, mask and disable lircd.socket and lircd.service # (the default lirc configuration conflicts with eventlircd)
   systemd:
@@ -31,6 +27,12 @@
     - lircd.socket
   ignore_errors: yes
 
+- name: configure vdr to read from a lircd-compatible socket
+  template:
+    src: templates/03-vdr-lirc.conf.j2
+    dest: /etc/vdr/conf.d/03-vdr-lirc.conf
+  notify: notify: ['Restart VDR']
+
 # TODO: upload lircd2uinput package to PPA
 #- name: install lircd2uinput
 #  tag: install