A User wants to install yaVDR without customization and relies on full automation. @@ -489,22 +490,22 @@ Several roles are used to tie everything together:
One of the major problems we faced with customized Ubuntu ISO files as installation media for prior yaVDR versions has been the limited hardware support and the time consuming process to create and update them. An interesting alternative to this approach is to enable the user to choose the installation medium himself so point releases, kernel versions and additional drivers can be chosen deliberately. After the basic setup is complete (and a working internet connection is available), a fully customizable install script completes the yaVDR installation.
This is an experimental feature which allows to set up a yaVDR installation based on a normal Ubuntu Server 16.04.x installation using Ansible. @@ -526,8 +527,8 @@ sudo ./install-yavdr.sh
if (( $EUID != 0 )); then @@ -550,12 +551,12 @@ ansible-playbook yavdr07.yml -b -i 'localhost_inventory
The yavdr07.yml playbook sets up a fully-featured yaVDR installation:
@@ -604,8 +605,8 @@ The yavdr07.yml playbook sets up a fully-featured yaVDR installatio
For a headless server installation yavdr07-headless.yml is a good choice
@@ -638,8 +639,8 @@ For a headless server installation yavdr07-headless.yml is a good c
This playbook can either be used to run the installation on the localhost or any other PC in the network that can be accessed via ssh. Simply add the host names or IP addresses to the hosts file in the respective section: @@ -653,12 +654,12 @@ This playbook can either be used to run the installation on the localhost or any
---
@@ -670,8 +671,8 @@ This playbook can either be used to run the installation on the localhost or any
branch: unstable
@@ -687,8 +688,8 @@ This playbook can either be used to run the installation on the localhost or any
# properties of the user vdr and vdr-related options @@ -715,8 +716,8 @@ This playbook can either be used to run the installation on the localhost or any
# dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled @@ -731,8 +732,8 @@ This playbook can either be used to run the installation on the localhost or any
nfs:
@@ -741,8 +742,8 @@ This playbook can either be used to run the installation on the localhost or any
samba:
@@ -752,8 +753,8 @@ This playbook can either be used to run the installation on the localhost or any
# additional packages you want to install @@ -768,8 +769,8 @@ This playbook can either be used to run the installation on the localhost or any
frontend: vdr
@@ -784,20 +785,20 @@ This playbook can either be used to run the installation on the localhost or any
---
@@ -817,19 +818,19 @@ This playbook can either be used to run the installation on the localhost or any
install nvidia-387 from ppa:graphics-drivers/ppa
---
@@ -855,15 +856,15 @@ install nvidia-387 from ppa:graphics-drivers/ppa
This role is used to set up a basic yaVDR installation. It creates the directories, installs the vdr and other useful packages.
This section is for reference only, please use the files in global_vars for customizations.
@@ -876,7 +877,7 @@ This section is for reference only, please use the files in global_vars
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. @@ -906,7 +907,7 @@ Automatically installed drivers can be very useful, but if you know you need a c
Add additional packages you would like to have on your installation to this list @@ -920,7 +921,7 @@ Add additional packages you would like to have on your installation to this list
This section allows you to set the recording directory, the user and group that runs the vdr and it’s home directory. @@ -953,15 +954,15 @@ This section allows you to set the recording directory, the user and group that
yavdr-common executes the following tasks:
- name: add PPAs
@@ -1012,7 +1013,7 @@ This task prevents apt to automatically install all recommended dependencies for
- name: use bash instead of dash
@@ -1024,8 +1025,8 @@ This task prevents apt to automatically install all recommended dependencies for
- name: disable release-upgrade notifications
@@ -1039,7 +1040,7 @@ This task prevents apt to automatically install all recommended dependencies for
- name: apt | install basic packages
@@ -1071,7 +1072,7 @@ This task prevents apt to automatically install all recommended dependencies for
- name: apt | install extra packages
@@ -1085,13 +1086,13 @@ This task prevents apt to automatically install all recommended dependencies for
{{ ansible_managed_file | comment('c') }}
@@ -1103,16 +1104,16 @@ APT::Install-Suggests "0";
- name: get information about usb and pci hardware and loaded kernel modules @@ -1139,16 +1140,16 @@ APT::Install-Suggests "0";
--- @@ -1167,7 +1168,7 @@ APT::Install-Suggests "0";
- name: add svdrp and svdrp-disc to /etc/services @@ -1182,7 +1183,7 @@ APT::Install-Suggests "0";
- name: create vdr recdir @@ -1218,7 +1219,7 @@ APT::Install-Suggests "0";
The additional plugins to install can be set in the variable {{vdr_plugins}} in the group variables
@@ -1236,7 +1237,7 @@ The additional plugins to install can be set in the variable {{vdr_plugins
- name: ensure vdr is stopped
@@ -1269,15 +1270,15 @@ The additional plugins to install can be set in the variable {{vdr_plugins
LIRC.Up KEY_UP @@ -1412,7 +1413,7 @@ XKeySym.Next XF86AudioNext
# Remote control key macros for VDR @@ -1438,12 +1439,12 @@ User0 @osdteletext
install_avahi: true @@ -1451,8 +1452,8 @@ User0 @osdteletext
---
@@ -1522,15 +1523,15 @@ User0 @osdteletext
---
@@ -1559,12 +1560,12 @@ User0 @osdteletext
/srv *(rw,fsid=0,sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }})
@@ -1575,7 +1576,7 @@ User0 @osdteletext
<?xml version="1.0" standalone='no'?> @@ -1596,15 +1597,15 @@ User0 @osdteletext
---
@@ -1655,8 +1656,8 @@ User0 @osdteletext
{% if frontend != 'kodi' %} @@ -1667,17 +1668,17 @@ User0 @osdteletext
---
@@ -1699,8 +1700,8 @@ User0 @osdteletext
# Use PulseAudio by default @@ -1722,12 +1723,12 @@ User0 @osdteletext
The X-Server is started by using the two systemd units xlogin@.service and x@.service provided by the package xlogin. The former is enabled (and started) for the vdr user - which results (using the default settings for the user vdr with the uid 666) in the activation of xlogin@vdr.service when reaching the graphical.target.
@@ -1755,11 +1756,11 @@ In order to achive a clean shutdown of the session, x@t7.service is
--- @@ -1778,31 +1779,31 @@ In order to achive a clean shutdown of the session,x@t7.serviceis dest: '{{ item }}' state: directory with_items: - - /etc/systemd/system/x@.service.d/ - - /etc/systemd/system/vdr.service.d/ - - '/etc/systemd/system/user@{{ vdr.uid }}.service.d/' + - "/etc/systemd/system/x@.service.d/" + - "/etc/systemd/system/vdr.service.d/" + - "/etc/systemd/system/user@{{ vdr.uid }}.service.d/" -- name: add dependency to X-server for vdr.service using a drop-in +- name: systemd-drop-in: add dependency to X-server for vdr.service template: src: templates/vdr-xorg.conf dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf -- name: start x@.service before xlogin@.service +- name: systemd-drop-in: start x@.service before xlogin@.service template: src: templates/x@service.d/xlogin.conf.j2 dest: /etc/systemd/system/x@.service.d/xlogin.conf -- name: load environment file for vdr.service +- name: systemd-drop-in: load environment file for vdr.service template: src: templates/systemd/vdr-environ.j2 dest: /etc/systemd/system/vdr.service.d/load-environ.conf -- name: user@{{ vdr.uid }}.service depends on x@vt7.service +- name: systemd-drop-in: user@{{ vdr.uid }}.service depends on x@vt7.service template: src: templates/user@666.service.d/x-dependency.conf.j2 dest: '/etc/systemd/system/user@{{ vdr.uid }}.service.d/x-dependency.conf' -- name: start softhddevice detached and set audio to pulseaudio +- name: vdr-config: start softhddevice detached and set audio to pulseaudio lineinfile: path: /etc/vdr/conf.avail/softhddevice.conf line: '{{ item }}' @@ -1810,7 +1811,7 @@ In order to achive a clean shutdown of the session,x@t7.serviceis - '-D' # - '-a pulse' # do we need this with our existing asound.conf? -- name: set a login shell for the user vdr +- name: add a login shell for the user vdr user: name: '{{ vdr.user }}' shell: '/bin/bash' @@ -1878,6 +1879,10 @@ In order to achive a clean shutdown of the session,x@t7.serviceis name: x@vt7.service state: stopped +- name: "wait a little bit before starting x-verbose@vt7.service (needed?)" + wait_for: + timeout: 3 + - name: "start x-verbose@.service" systemd: name: "x-verbose@vt7.service" @@ -1907,14 +1912,23 @@ In order to achive a clean shutdown of the session,x@t7.serviceis enabled: false masked: true +- name: "wait a little bit, so X has some time to shut down (needed?)" + wait_for: + timeout: 3 + # TODO: expand template for xorg.conf (or snippets) # with respect for the available graphics card driver # nvidia, noveau, intel, radeon -- name: create xorg.conf (for nvidia driver) - template: - src: templates/xorg.conf.j2 - dest: /etc/X11/xorg.conf - backup: yes + +- name: nvidia related config + block: + - name: create xorg.conf (for nvidia driver) + template: + src: templates/xorg.conf.j2 + dest: /etc/X11/xorg.conf + backup: yes + when: + - 'if {% gpus | selectattr("VendorName", "nvidia") | list %}'
x@t7.service is
# file: roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2
@@ -2039,7 +2053,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
[Unit]
@@ -2060,7 +2074,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
# file: roles/yavdr-xorg/templates/vdr-xorg.conf
@@ -2073,7 +2087,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
#!/bin/bash
@@ -2083,7 +2097,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
Section "Device"
@@ -2410,7 +2424,7 @@ EndSection
-[Service]
@@ -2420,9 +2434,9 @@ EndSection
[Unit] @@ -2436,7 +2450,7 @@ EndSection
[Unit]
@@ -2452,7 +2466,7 @@ EndSection
[Unit]
@@ -2473,7 +2487,7 @@ EndSection
[Unit]
@@ -2494,7 +2508,7 @@ EndSection
[Unit]
@@ -2513,7 +2527,7 @@ EndSection
[Unit]
@@ -2532,9 +2546,9 @@ EndSection
-# forward environment variables to an environment file and the systemd user session @@ -2568,7 +2582,7 @@ systemctl --user isolate yavdr-desktop.target
<?xml version="1.0" encoding="UTF-8"?> @@ -3398,12 +3412,12 @@ systemctl --user isolate yavdr-desktop.target
---
@@ -3425,12 +3439,12 @@ systemctl --user isolate yavdr-desktop.target
---
@@ -3455,14 +3469,14 @@ systemctl --user isolate yavdr-desktop.target
{{ ansible_managed_file | comment }}
@@ -3548,7 +3562,7 @@ systemctl --user isolate yavdr-desktop.target
{% for name, path in media_dirs.iteritems() %}
@@ -3570,7 +3584,7 @@ systemctl --user isolate yavdr-desktop.target
include = /etc/samba/smb.conf.custom @@ -3583,15 +3597,15 @@ systemctl --user isolate yavdr-desktop.target
It would be nice to be able to detect if it is suitable to install those drivers:
Vendor-IDs: @@ -3602,14 +3616,14 @@ Vendor-IDs:
from http://www.vdr-portal.de/board18-vdr-hardware/board102-dvb-karten/120817-treiber-der-cine-ctv6-ddbridge-ci-in-den-kernel-integrieren/
@@ -3618,15 +3632,15 @@ from
-
The tool ubuntu-drivers is used to install the matching driver version for nvidia graphics cards, virtualbox guest additions and Intel and AMD microcode updates.
If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip is installed.
Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware sollte in yavdr-firmware stecken
This systemd unit for the user session starts (and stops) kodi.
@@ -4038,15 +4052,15 @@ This systemd unit for the user session starts (and stops) kodi.
Those configuration files provide a preconfiguration for kodi which overrides the system wide configuration
This file maps the keys defined in Lircmap.xml to actions within kodi.
This section contains custom modules for the yaVDR Playbooks. They are used to collect facts about the system and configure applications and daemons.
7.14 autoinstall-ubuntu-drivers
+7.14 autoinstall-ubuntu-drivers
7.14.1 tasks
+7.14.1 tasks
---
@@ -3649,15 +3663,15 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
7.15 autoinstall-satip
+7.15 autoinstall-satip
7.15.1 tasks
+7.15.1 tasks
---
@@ -3682,12 +3696,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.16 autoinstall-targavfd
+7.16 autoinstall-targavfd
7.16.1 tasks
+7.16.1 tasks
---
@@ -3703,12 +3717,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.17 autoinstall-imonlcd
+7.17 autoinstall-imonlcd
7.17.1 tasks
+7.17.1 tasks
---
@@ -3724,12 +3738,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.18 autoinstall-libcecdaemon
+7.18 autoinstall-libcecdaemon
7.18.1 tasks
+7.18.1 tasks
---
@@ -3745,12 +3759,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.19 autoinstall-pvr350
+7.19 autoinstall-pvr350
7.19.1 tasks
+7.19.1 tasks
---
@@ -3766,8 +3780,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.20 autoinstall-hauppauge-pvr
+7.20 autoinstall-hauppauge-pvr
---
@@ -3782,12 +3796,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.21 autoinstall-dvbsky-firmware
+7.21 autoinstall-dvbsky-firmware
7.21.1 defaults
+7.21.1 defaults
---
@@ -3797,8 +3811,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.21.2 tasks
+7.21.2 tasks
---
@@ -3808,7 +3822,7 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
block:
- name: add firmware for DVBSky S952 V3 to variable dvbsky_firmware_files if a card has been detected
set_fact:
- dvbsky_firmware_files: dvbsky_firmware_files + [ 'dvb-demod-m88rs6000.fw']
+ dvbsky_firmware_files: "{{dvbsky_firmware_files}} + ['dvb-demod-m88rs6000.fw']"
when:
- '"1ade:3038" in pci'
- ansible_distribution_version >= '15.04' #driver only included since Kernel 3.19
@@ -3849,15 +3863,15 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
7.22 TODO autoinstall-dvbhddevice
+7.22 TODO autoinstall-dvbhddevice
7.22.1 tasks
+7.22.1 tasks
---
@@ -3874,12 +3888,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
7.23 autoinstall-dvbsddevice
+7.23 autoinstall-dvbsddevice
7.23.1 tasks
+7.23.1 tasks
---
@@ -3895,12 +3909,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
7.24 autoinstall-hardware-irmp
+7.24 autoinstall-hardware-irmp
7.24.1 tasks
+7.24.1 tasks
7.25 kodi
+7.25 kodi
7.25.1 tasks
+7.25.1 tasks
-
+
-
-
+- import_tasks: install-kodi.yml tags=install,update,kodi:install
- import_tasks: configure-kodi.yml tags=install,update,kodi:configure
@@ -3941,7 +3955,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
+
---
@@ -3959,7 +3973,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
+
- name: create kodi.service for the user session
@@ -4008,12 +4022,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
7.25.2 templates
+7.25.2 templates
-
+
7.25.3 files
+7.25.3 files
+
-
+
<!-- This file contains the mapping of keys (gamepad, remote, and keyboard) to actions within XBMC -->
@@ -4674,17 +4688,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
7.26 dvd
+7.26 dvd
7.26.1 tasks
+7.26.1 tasks
-
-
+---
# file: roles/dvd/tasks/main.yml
@@ -4724,8 +4738,8 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
7.27 template-test
+7.27 template-test
---
@@ -4966,12 +4980,12 @@ EndSection
7.28 wakeup
+7.28 wakeup
7.28.1 defaults
+7.28.1 defaults
---
@@ -4981,36 +4995,61 @@ EndSection
7.28.2 tasks
+7.28.2 tasks
---
# file roles/wakeup/tasks/main.yml
- name: install and configure vdr-addon-acpiwakeup
- block:
- - apt:
- name: vdr-addon-acpiwakeup
- state: present
-
- - lineinfile:
- path: /etc/vdr/vdr-addon-acpiwakeup.conf
- regexp: '^ACPI_ENABLED='
- line: 'ACPI_ENABLED=true'
-
+ apt:
+ name: vdr-addon-acpiwakeup
+ state: present
when: wakeup_method == "acpiwakeup"
+
+- name: expand template for /etc/vdr/vdr-addon-acpiwakeup.conf
+ template:
+ src: templates/vdr-addon-acpiwakeup.conf.j2
+ dest: /etc/vdr/vdr-addon-acpiwakeup.conf
+
+
+7.28.3 templates
+{{ ansible_managed_file | comment }}
+
+# Activate/deactivate ACPIWakeup with yes/no:
+ACPI_ENABLED="{% if wakeup_method == 'acpiwakeup' %}yes{% else %}no{% endif %}"
+
+# How many minutes should the machine wake up before the timer starts:
+ACPI_START_AHEAD=5
+
+# If you want your VDR machine to wakeup in regular intervals (i.e. for
+# updating EPG data), specify the days of the week and the wakeup time.
+#
+# Days of the week for regular wakeup (not set=Disabled, 1=Monday...7=Sunday)
+# ACPI_REGULAR_DAYS="1 2 3 4 5 6 7"
+
+# Wakeup time
+#ACPI_REGULAR_TIME=01:00 # HH:MM
+
7.29 grub-config
+
+7.29 grub-config
7.29.1 default variables
+7.29.1 default variables
system:
@@ -5022,8 +5061,8 @@ EndSection
7.29.2 tasks
+7.29.2 tasks
---
@@ -5048,8 +5087,8 @@ EndSection
7.29.3 templates
+7.29.3 templates
#!/bin/sh
@@ -5072,8 +5111,8 @@ menuentry "PowerOff" {
7.29.4 handlers
+7.29.4 handlers
---
@@ -5091,15 +5130,15 @@ menuentry "PowerOff" {
8 Modules
+8 Modules
8.1 hardware_facts.py
+8.1 hardware_facts.py
# This Module collects the vendor- and device ids for USB- and PCI(e)-devices and currently loaded kernel modules.
@@ -5155,11 +5194,11 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
acpi_power_modes: True
- debug:
var: usb
-- debug
+- debug:
var: pci
-- debug
+- debug:
var: modules
-- debug
+- debug:
var: gpus
'''
@@ -5266,8 +5305,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
8.2 satip_facts.py
+8.2 satip_facts.py
DOCUMENTATION = '''
@@ -5391,8 +5430,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
8.3 xrandr_facts.py
+8.3 xrandr_facts.py
[ ] support multiple screens (-d :0.0 .. :0.n)9 Handlers
+9 Handlers
- name: Reconfigure unattended upgrades with dpkg
@@ -5737,7 +5776,7 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c