Fix role name in yavdr07-headless.yml

Manual.org

@@ -281,7 +281,7 @@ vdr_plugins:
 # dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled
 media_dirs:
   audio: /srv/audio
-  video: /srv/audio
+  video: /srv/video
   pictures: /srv/picture
   files: /srv/files
   backups: /srv/backups
@@ -1499,7 +1499,7 @@ b'\xde\xad\xbe\xef'
 - name: vdr-config | start softhddevice detached and set audio to pulseaudio
   lineinfile:
     path: /etc/vdr/conf.avail/softhddevice.conf
-    line: '{{ item }}'
+    line: '{{ item }}ys
   with_items:
       - '-D'
       # - '-a pulse' # do we need this with our existing asound.conf?
@@ -3199,12 +3199,10 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
 
     - name: use ubuntu-drivers to install additional drivers automatically
       command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
-  when:
+  when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or
-    - ansible_virtualization_type != "virtualbox"
+        ansible_distribution_version != "16.04"
-    - ansible_virtualization_role != "guest"
+        # ubuntu-drivers-common tries to autoinstall
-    - ansible_distribution == "Ubuntu"
+        # conflicting packages for virtualbox in Ubuntu 16.04 :(
-    - ansible_distribution_version != "16.04"  # ubuntu-drivers-common tries to autoinstall
-                                               # conflicting packages for virtualbox :(
 #+END_SRC
 ** autoinstall-virtualbox-guest
 This role installs the guest additions for virtualbox guests on Ubuntu 16.04

group_vars/all

@@ -34,7 +34,7 @@ vdr_plugins:
 # dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled
 media_dirs:
   audio: /srv/audio
-  video: /srv/audio
+  video: /srv/video
   pictures: /srv/picture
   files: /srv/files
   backups: /srv/backups

roles/autoinstall-dvbsky-firmware/tasks/main.yml

@@ -3,12 +3,19 @@
 
 - name: determine needed firmware files by device ids
   block:
-    - name: add firmware for DVBSky S952 V3 to variable dvbsky_firmware_files if a card has been detected
+    - name: add firmware files for DVBSky if a card has been detected
       set_fact:
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-demod-m88ds3103.fw']"
         dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-demod-m88rs6000.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-demod-si2168-a20-01.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-demod-si2168-a30-01.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-demod-si2168-b40-01.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-fe-ds300x.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-fe-ds3103.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-fe-rs6000.fw']"
+        dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-tuner-si2158-a20-01.fw']"
       when:
         - '"1ade:3038" in pci'
-        - ansible_distribution_version >= '15.04'  #driver only included since Kernel 3.19
   when:
     - not dvbsky_firmware_files
 

roles/autoinstall-ubuntu-drivers/tasks/main.yml

@@ -10,9 +10,7 @@
 
     - name: use ubuntu-drivers to install additional drivers automatically
       command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
-  when:
+  when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest") or
-    - ansible_virtualization_type != "virtualbox"
+        ansible_distribution_version != "16.04"
-    - ansible_virtualization_role != "guest"
+        # ubuntu-drivers-common tries to autoinstall
-    - ansible_distribution == "Ubuntu"
+        # conflicting packages for virtualbox in Ubuntu 16.04 :(
-    - ansible_distribution_version != "16.04"  # ubuntu-drivers-common tries to autoinstall
-                                               # conflicting packages for virtualbox :(

yavdr07-headless.yml

@@ -10,7 +10,7 @@
     - collect-facts              # query system facts
     - vdr
     - yavdr-network
-    - samba-server
+    - samba-install
     - samba-config
     - nfs-server
     - grub-config