Merge branch 'master' of https://github.com/yavdr/yavdr-ansible

roles/yavdr-common/defaults/main.yml

@@ -1,20 +1,22 @@
+---
+# file: roles/yavdr-common/defaults/main.yml
 
 branch: unstable
 repositories:
-    - 'ppa:yavdr/main'
-    - 'ppa:yavdr/unstable-main'
-    - 'ppa:yavdr/{{branch}}-vdr'
-    - 'ppa:yavdr/{{branch}}-kodi'
-    - 'ppa:yavdr/{{branch}}-yavdr'
+  - 'ppa:yavdr/main'
+  - 'ppa:yavdr/unstable-main'
+  - 'ppa:yavdr/{{branch}}-vdr'
+  - 'ppa:yavdr/{{branch}}-kodi'
+  - 'ppa:yavdr/{{branch}}-yavdr'
 
 drivers:
-    sundtek: auto
-    ddvb-dkms: auto
+  sundtek: auto
+  ddvb-dkms: auto
 
-extra_packages:
-    - vim
-    - tree
-    - w-scan
+  extra_packages:
+      - vim
+      - tree
+      - w-scan
 
 vdr:
     user: vdr
@@ -23,6 +25,6 @@ vdr:
     gid: 666
     home: /var/lib/vdr
     recdir: /srv/vdr/video
-    hide_first_recording_level: true
+    hide_first_recording_level: false
     safe_dirnames: true
     override_vdr_charset: false

roles/yavdr-common/files/90-norecommends.j2

@@ -0,0 +1,4 @@
+// {{ ansible_managed_file }}
+// Recommends are as of now still abused in many packages
+APT::Install-Recommends "0";
+APT::Install-Suggests "0";

roles/yavdr-common/tasks/main.yml

@@ -1,17 +1,11 @@
-
 ---
 # This playbook sets up the basic packages an directories for a yaVDR installation
+# file: roles/yavdr-common/tasks/main.yml
 
-- name: apt| prevent installation of recommended packages
-  blockinfile:
+- name: apt | prevent automatic installation of recommended packages
+  template:
+      src: templates/90-norecommends.j2
       dest: /etc/apt/apt.conf.d/90norecommends
-      create: yes
-      state: present
-      marker: "// *** {mark} ANSIBLE MANAGED BLOCK ***"
-      block: |
-          // Recommends are as of now still abused in many packages
-          APT::Install-Recommends "0";
-          APT::Install-Suggests "0";
 
 - name: add yaVDR PPAs
   apt_repository:
@@ -25,66 +19,22 @@
       upgrade: dist
       update_cache: yes
 
-- name: install basic packages
+- name: apt | install basic packages
   apt:
-      name: '{{ item }}'
-      state: present
-      install_recommends: no
+    name: '{{ item }}'
+    state: present
+    install_recommends: no
   with_items:
-      - anacron
-      - at
-      - bash-completion
-      - biosdevname
-      - linux-firmware
-      - psmisc
-      - software-properties-common
-      - ssh
-      - ubuntu-drivers-common
-      - vdr
-      - vdr-plugin-dbus2vdr
-      - vdrctl
-      - wget
-      - wpasupplicant
-      - usbutils
-      - xfsprogs
-
-- name: create vdr recdir
-  file:
-      state: directory
-      owner: '{{ vdr.user }}'
-      group: '{{ vdr.group }}'
-      mode: 0775
-      dest: '{{ vdr.recdir }}'
-
-- name: set option to use hide-first-recording-level patch
-  blockinfile:
-      dest: /etc/vdr/conf.d/04-vdr-hide-first-recordinglevel.conf
-      create: true
-      block: |
-          [vdr]
-          --hide-first-recording-level
-  when:
-      vdr.hide_first_recording_level
-
-- name: create local dir in recdir
-  file:
-      state: directory
-      owner: '{{ vdr.user }}'
-      group: '{{ vdr.group }}'
-      mode: 0775
-      dest: '{{ vdr.recdir }}/local'
-  when:
-      vdr.hide_first_recording_level
-
-- name: create directories for media files
-  file:
-      state: directory
-      owner: '{{ vdr.user }}'
-      group: '{{ vdr.group }}'
-      mode: 0775
-      dest: '{{ item }}'
-  with_items:
-      - /srv/videos
-      - /srv/music
-      - /srv/picture
-      - /srv/backups
+    - anacron
+    - at
+    - bash-completion
+    - biosdevname
+    - linux-firmware
+    - psmisc
+    - software-properties-common
+    - ssh
+    - ubuntu-drivers-common
+    - wget
+    - wpasupplicant
+    - usbutils
+    - xfsprogs

roles/yavdr-common/templates/90-norecommends.j2

@@ -0,0 +1,4 @@
+// {{ ansible_managed_file }}
+// Recommends are as of now still abused in many packages
+APT::Install-Recommends "0";
+APT::Install-Suggests "0";