From 5c5826db9a94d1c9cbaab60fa99a4ee26cfa930c Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Mon, 13 Nov 2017 09:46:51 +0100 Subject: [PATCH] Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added --- Manual.org | 18 ++++++++++++++++ handlers/main.yml | 3 +++ .../autoinstall-hardware-irmp/tasks/main.yml | 7 +++++++ roles/dvd/tasks/main.yml | 21 ++++++++++++++----- yavdr07.yml | 1 + 5 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 roles/autoinstall-hardware-irmp/tasks/main.yml diff --git a/Manual.org b/Manual.org index 6ef747e..4629e94 100644 --- a/Manual.org +++ b/Manual.org @@ -183,6 +183,7 @@ The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation: - autoinstall-pvr350 # install vdr-plugin-pgvr350 if a matching card is detected - autoinstall-hauppauge-pvr # install vdr-plugin-pvrinput if a matching card is found - autoinstall-dvbsddevice # install vdr-plugin-dvbsddevice if a matching card is detected + - autoinstall-hardware-irmp # install yavdr-hardware-irmp if a matching usb device is detected - kodi - dvd # set up packages and a udev rule to allow kodi and other players # to play and eject optical media @@ -3250,6 +3251,20 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll when: '"dvb_ttpci" in modules' notify: [ 'Restart VDR' ] #+END_SRC +** autoinstall-hardware-irmp +*** tasks +#+BEGIN_SRC yaml :tangle roles/autoinstall-hardware-irmp/tasks/main.yml :padline no +--- +# file roles/autoinstall-hardware-irmp/tasks/main.yml + +- name: apt | install yavdr-hardware-irmp if connected + apt: + name: yavdr-hardware-irmp + when: '"1209:4444" in usb' +#+END_SRC + +**** TODO add other device ids if necessary + ** kodi *** tasks **** Install KODI @@ -4116,6 +4131,9 @@ if __name__ == '__main__': #+END_SRC * Handlers #+BEGIN_SRC yaml :tangle handlers/main.yml :mkdirp yes +- name: Reconfigure unattended upgrades with dpkg + command: '/usr/sbin/dpkg-reconfigure --frontend noninteractive unattended-upgrades' + - name: Restart Samba systemd: name: smbd.service diff --git a/handlers/main.yml b/handlers/main.yml index 840b674..9c5887a 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,3 +1,6 @@ +- name: Reconfigure unattended upgrades with dpkg + command: '/usr/sbin/dpkg-reconfigure --frontend noninteractive unattended-upgrades' + - name: Restart Samba systemd: name: smbd.service diff --git a/roles/autoinstall-hardware-irmp/tasks/main.yml b/roles/autoinstall-hardware-irmp/tasks/main.yml new file mode 100644 index 0000000..cfb5a99 --- /dev/null +++ b/roles/autoinstall-hardware-irmp/tasks/main.yml @@ -0,0 +1,7 @@ +--- +# file roles/autoinstall-hardware-irmp/tasks/main.yml + +- name: apt | install yavdr-hardware-irmp if connected + apt: + name: yavdr-hardware-irmp + when: '"1209:4444" in usb' diff --git a/roles/dvd/tasks/main.yml b/roles/dvd/tasks/main.yml index 4f7a37f..ebbb462 100644 --- a/roles/dvd/tasks/main.yml +++ b/roles/dvd/tasks/main.yml @@ -1,10 +1,10 @@ --- # file: roles/dvd/tasks/main.yml -- name: preconfigure libdvd-pkg - shell: | - echo 'libdvd-pkg libdvd-pkg/post-invoke_hook-install boolean true' | debconf-set-selections - echo 'libdvd-pkg libdvd-pkg/build boolean true' | debconf-set-selections +#- name: preconfigure libdvd-pkg +# shell: | +# echo 'libdvd-pkg libdvd-pkg/post-invoke_hook-install boolean true' | debconf-set-selections +# echo 'libdvd-pkg libdvd-pkg/build boolean true' | debconf-set-selections - name: apt | install libdvd-pkg apt: @@ -12,7 +12,18 @@ state: present install_recommends: no with_items: - - libdvd-pkg + - 'libdvd-pkg' + +- name: configure package libdvd-pkg + debconf: + name: 'libdvd-pkg' + question: '{{ item }}' + vtype: boolean + value: true + with_items: + - 'libdvd-pkg/post-invoke_hook-install' + - 'libdvd-pkg/build boolean' + notify: ['Reconfigure unattended upgrades with dpkg'] - name: change udev rule to allow KODI to eject optical disks shell: sed 's/--lock-media //' /lib/udev/rules.d/60-cdrom_id.rules > /etc/udev/rules.d/60-cdrom_id.rules diff --git a/yavdr07.yml b/yavdr07.yml index 0ecb558..4938a2b 100644 --- a/yavdr07.yml +++ b/yavdr07.yml @@ -24,6 +24,7 @@ - autoinstall-pvr350 # install vdr-plugin-pgvr350 if a matching card is detected - autoinstall-hauppauge-pvr # install vdr-plugin-pvrinput if a matching card is found - autoinstall-dvbsddevice # install vdr-plugin-dvbsddevice if a matching card is detected + - autoinstall-hardware-irmp # install yavdr-hardware-irmp if a matching usb device is detected - kodi - dvd # set up packages and a udev rule to allow kodi and other players # to play and eject optical media