From c42881044e89581f9007b6ad9a41e1f12794f4e9 Mon Sep 17 00:00:00 2001
From: Alexander Grothe <seahawk1986@gmx.de>
Date: Fri, 28 Jul 2017 16:08:30 +0200
Subject: [PATCH 1/2] simplify debug output

---
 roles/yavdr-common/tasks/main.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/roles/yavdr-common/tasks/main.yml b/roles/yavdr-common/tasks/main.yml
index c6a5e41..d1a27eb 100644
--- a/roles/yavdr-common/tasks/main.yml
+++ b/roles/yavdr-common/tasks/main.yml
@@ -76,18 +76,15 @@
     pci: True
     modules: True
     gpus: True
+    
 - debug:
-    var: usb
-    verbosity: 1
-- debug:
-    var: pci
-    verbosity: 1
-- debug:
-    var: modules
-    verbosity: 1
-- debug:
-    var: gpus
+    var: '{{ item }}'
     verbosity: 1
+  with_items:
+    - usb
+    - pci
+    - gpus
+    - modules
 - name: create media directories
   file:
     dest: '{{ item.value }}'

From 728fd7c92ba393a38d60de1006bed85de668fe6f Mon Sep 17 00:00:00 2001
From: Alexander Grothe <seahawk1986@gmx.de>
Date: Fri, 28 Jul 2017 16:09:11 +0200
Subject: [PATCH 2/2] Cleanup

---
 Manual.org                           | 34 ++++++++++++----------------
 roles/yavdr-common/defaults/main.yml | 13 +++++++----
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Manual.org b/Manual.org
index 0353973..e0433b8 100644
--- a/Manual.org
+++ b/Manual.org
@@ -347,13 +347,12 @@ This role is used to set up a basic yaVDR installation. It creates the directori
 This section is for reference only, please use the files in ~global_vars~ for customizations.
 #+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline no
 ---
-
 # file: roles/yavdr-common/defaults/main.yml
 #+END_SRC
 
 **** Repositories
 You can set a list of package repositories which provide the necessary packages. Feel free to use own PPAs if you need special customization to the VDR and it's plugins.
-#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes
+#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
 branch: unstable
 repositories:
   - 'ppa:yavdr/main'
@@ -364,18 +363,18 @@ repositories:
 #+END_SRC
 **** Drivers
 Automatically installed drivers can be very useful, but if you know you need a certain driver, you can simply set it's value to *true*. If you don't want a driver to be installed, set it's value to *false*.
-#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes
+#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
 drivers:
   sundtek: auto
   ddvb-dkms: auto
 #+END_SRC
 **** Additional Packages
 Add additional packages you would like to have on your installation to this list
-#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes
-  extra_packages:
-      - vim
-      - tree
-      - w-scan
+#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
+extra_packages:
+  - vim
+  - tree
+  - w-scan
 #+END_SRC
 **** VDR
 This section allows you to set the recording directory, the user and group that runs the vdr and it's home directory.
@@ -388,7 +387,7 @@ This section allows you to set the recording directory, the user and group that
  - hide_first_recording_level :: let vdr hide the first directory level of it's recording directory so the content of multiple directories is shown merged together
  - safe_dirnames :: replace special characters which are not compatible with Windows file systems and Samba shares
  - override_vdr_charset :: workaround for channels with weird EPG encodings, e.g. Sky
-#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes
+#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
 vdr:
     user: vdr
     group: vdr
@@ -509,18 +508,15 @@ yavdr-common executes the following tasks:
     pci: True
     modules: True
     gpus: True
+    
 - debug:
-    var: usb
-    verbosity: 1
-- debug:
-    var: pci
-    verbosity: 1
-- debug:
-    var: modules
-    verbosity: 1
-- debug:
-    var: gpus
+    var: '{{ item }}'
     verbosity: 1
+  with_items:
+    - usb
+    - pci
+    - gpus
+    - modules
 #+END_SRC
 ***** create media directories
 #+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/main.yml :exports none :mkdirp yes
diff --git a/roles/yavdr-common/defaults/main.yml b/roles/yavdr-common/defaults/main.yml
index 197cbcd..e539ac3 100644
--- a/roles/yavdr-common/defaults/main.yml
+++ b/roles/yavdr-common/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
-
 # file: roles/yavdr-common/defaults/main.yml
+
 branch: unstable
 repositories:
   - 'ppa:yavdr/main'
@@ -8,13 +8,16 @@ repositories:
   - 'ppa:yavdr/{{branch}}-vdr'
   - 'ppa:yavdr/{{branch}}-kodi'
   - 'ppa:yavdr/{{branch}}-yavdr'
+
 drivers:
   sundtek: auto
   ddvb-dkms: auto
-  extra_packages:
-      - vim
-      - tree
-      - w-scan
+
+extra_packages:
+  - vim
+  - tree
+  - w-scan
+
 vdr:
     user: vdr
     group: vdr