From f1709c849426fb79550ea8ac2c79960bb9d377b3 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Wed, 2 Jan 2019 09:26:56 +0100 Subject: [PATCH] rename variable serial_device to serial_ir_device and add an entry for the serial-ir role to the playbook (commented out by default, so the user has to enable it if required) --- Manual.html | 1009 +++++++++-------- Manual.org | 23 +- group_vars/all | 3 + roles/serial-ir/defaults/main.yml | 2 +- .../templates/modprobe.d/serial_ir.conf.j2 | 6 +- roles/serial-ir/templates/serial.conf.j2 | 4 +- yavdr07.yml | 1 + 7 files changed, 536 insertions(+), 512 deletions(-) diff --git a/Manual.html b/Manual.html index eee1a2b..4fd34db 100644 --- a/Manual.html +++ b/Manual.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Ansible Playbooks for yaVDR 0.7 @@ -240,269 +240,270 @@ for the JavaScript code in this tag.

Inhaltsverzeichnis

-
-

1 User Stories

+
+

1 User Stories

-
-

1.1 yavdr-full

+
+

1.1 yavdr-full

A User wants to install yaVDR without customization and relies on full automation. @@ -535,24 +536,24 @@ Several roles are used to tie everything together:

-
-

1.1.1 Using vdr, pulseaudio and xorg together

+
+

1.1.1 Using vdr, pulseaudio and xorg together

-
-

2 Introduction

+
+

2 Introduction

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 by 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.

-
-

3 Installing and configuring yaVDR with Ansible

+
+

3 Installing and configuring yaVDR with Ansible

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. @@ -587,8 +588,8 @@ We use a callback to generate tags for all roles autmatically:

-
-

3.1 Install scripts for local usage

+
+

3.1 Install scripts for local usage

set -e
@@ -633,12 +634,12 @@ ansible-playbook yavdr07-headless.yml -b -i 'localhost_
-
-

4 Playbooks

+
+

4 Playbooks

-
-

4.1 yavdr07.yml

+
+

4.1 yavdr07.yml

The yavdr07.yml playbook sets up a fully-featured yaVDR installation: @@ -678,6 +679,7 @@ The yavdr07.yml playbook sets up a fully-featured yaVDR installatio - autoinstall-yausbir # preconfigure lircd for yaUsbIR receiver - autoinstall-dvbsky-firmware # download and install required firmware files for dvbsky cards - autoinstall-firmware # download and install firmware files for dvb devices + #- serial-ir # configure a serial port for "homebrew" ir receivers (e.g. Atric V5) - kodi - dvd # set up packages and a udev rule to allow kodi and other players # to play and eject optical media @@ -690,8 +692,8 @@ The yavdr07.yml playbook sets up a fully-featured yaVDR installatio

-
-

4.2 yavdr07-headless.yml

+
+

4.2 yavdr07-headless.yml

For a headless server installation yavdr07-headless.yml is a good choice @@ -729,8 +731,8 @@ For a headless server installation yavdr07-headless.yml is a good c

-
-

5 Hosts

+
+

5 Hosts

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: @@ -744,12 +746,12 @@ This playbook can either be used to run the installation on the localhost or any

-
-

6 Group Variables

+
+

6 Group Variables

-
-

6.1 PPAs

+
+

6.1 PPAs

---
@@ -767,8 +769,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.2 VDR user, directories, special configuration and plugins

+
+

6.2 VDR user, directories, special configuration and plugins

# properties of the user vdr and vdr-related options
@@ -794,8 +796,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.3 Media directories

+
+

6.3 Media directories

# dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled
@@ -810,8 +812,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.4 NFS

+
+

6.4 NFS

nfs:
@@ -820,8 +822,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.5 Samba

+
+

6.5 Samba

samba:
@@ -831,8 +833,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.6 Additional packages

+
+

6.6 Additional packages

# additional packages you want to install
@@ -848,8 +850,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.7 System pre-configuration

+
+

6.7 System pre-configuration

frontend: vdr
@@ -863,21 +865,32 @@ This playbook can either be used to run the installation on the localhost or any
+
+

6.8 Serial IR

+
+
+
# Serial device to configure for a homebrew receiver.
+# Choose either ttyS0 (COM1) or ttyS1 (COM2)
+serial_ir_device = ttyS0
+
-
-

7 Roles

+
+
+
+
+

7 Roles

-
-

7.1 install-dependencies

+
+

7.1 install-dependencies

-
-

7.1.1 tasks

+
+

7.1.1 tasks

    -
  1. main.yml
    +
  2. main.yml
    ---
@@ -896,19 +909,19 @@ This playbook can either be used to run the installation on the localhost or any
    -
    -

    7.2 nvidia experimental drivers

    +
    +

    7.2 nvidia experimental drivers

    install nvidia-396 from ppa:graphics-drivers/ppa

    -
    -

    7.2.1 tasks

    +
    +

    7.2.1 tasks

      -
    1. main.yml
      +
    2. main.yml
      ---
@@ -937,15 +950,15 @@ install nvidia-396 from ppa:graphics-drivers/ppa
    -
    -

    7.3 yavdr-common

    +
    +

    7.3 yavdr-common

    This role is used to set up a basic yaVDR installation. It creates the directories, installs the vdr and other useful packages.

    -
    -

    7.3.1 default variables

    +
    +

    7.3.1 default variables

    This section is for reference only, please use the files in global_vars for customizations. @@ -958,7 +971,7 @@ This section is for reference only, please use the files in global_vars

      -
    1. Repositories
      +
    2. 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. @@ -975,7 +988,7 @@ You can set a list of package repositories which provide the necessary packages.

    3. -
  3. Drivers
    +
  4. 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. @@ -988,7 +1001,7 @@ Automatically installed drivers can be very useful, but if you know you need a c

-
  • Additional Packages
    +
  • Additional Packages

    Add additional packages you would like to have on your installation to this list @@ -1002,7 +1015,7 @@ Add additional packages you would like to have on your installation to this list

    • -
  • VDR
    +
  • VDR

    This section allows you to set the recording directory, the user and group that runs the vdr and it’s home directory. @@ -1035,15 +1048,15 @@ This section allows you to set the recording directory, the user and group that

    • -
    -

    7.3.2 tasks

    +
    +

    7.3.2 tasks

    yavdr-common executes the following tasks:

      -
    1. main.yml
      +
    2. main.yml
      ---
@@ -1061,7 +1074,7 @@ yavdr-common executes the following tasks:
        -
      1. Disable default installation of recommended packages
        +
      2. Disable default installation of recommended packages

        This task prevents apt to automatically install all recommended dependencies for packages: @@ -1078,7 +1091,7 @@ This task prevents apt to automatically install all recommended dependencies for

    -
  • Set up package repositories
    +
  • Set up package repositories
    - name: add PPAs
@@ -1098,7 +1111,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Use bash instead of dash
    +
  • Use bash instead of dash
    - name: use bash instead of dash
@@ -1110,15 +1123,15 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create user vdr
    +
  • create user vdr
    • -
  • Disable release-upgrade notifications
    +
  • Disable release-upgrade notifications
      -
    1. SOMEDAY move from lineinfile to template
      +
    2. SOMEDAY move from lineinfile to template
      - name: disable release-upgrade notifications
@@ -1140,7 +1153,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Install essential packages
    +
  • Install essential packages
    - name: apt | install basic packages
@@ -1171,7 +1184,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Install additional packages (user defined)
    +
  • Install additional packages (user defined)
    - name: apt | install extra packages
@@ -1184,15 +1197,15 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create directories
    +
  • create directories
    • -
  • create sudoers drop-in for vdr
    +
  • create sudoers drop-in for vdr
    • -
  • basic scripts for standby support
    +
  • basic scripts for standby support

    Stop vdr before entering suspend and unload dvb modules, reverse this operation on resume @@ -1203,8 +1216,8 @@ Stop vdr before entering suspend and unload dvb modules, reverse this operation

    • -
    -

    7.3.3 templates

    +
    +

    7.3.3 templates

    {{ ansible_managed | comment('c') }}
@@ -1215,7 +1228,7 @@ APT::Install-Suggests "0";
      -
    1. yavdr sudoers drop-in
      +
    2. yavdr sudoers drop-in

      Allow the vdr user to restart vdr.service and reboot the system @@ -1227,7 +1240,7 @@ Allow the vdr user to restart vdr.service and reboot the system

    -
  • suspend hooks
    +
  • suspend hooks
    #!/bin/sh
@@ -1248,7 +1261,7 @@ Allow the vdr user to restart vdr.service and reboot the system
    • -
  • module-helper
    +
  • module-helper
    #!/usr/bin/env python3
@@ -1335,12 +1348,12 @@ Allow the vdr user to restart vdr.service and reboot the system
    -
    -

    7.4 collect facts about the system with custom modules

    +
    +

    7.4 collect facts about the system with custom modules

    -
    -

    7.4.1 variables

    +
    +

    7.4.1 variables

    first_run: False
@@ -1348,12 +1361,12 @@ Allow the vdr user to restart vdr.service and reboot the system
    -
    -

    7.4.2 tasks

    +
    +

    7.4.2 tasks

      -
    1. main.yml
      +
    2. main.yml
      - name: get information about usb and pci hardware and loaded kernel modules
@@ -1402,16 +1415,16 @@ Allow the vdr user to restart vdr.service and reboot the system
    -
    -

    7.5 vdr

    +
    +

    7.5 vdr

    -
    -

    7.5.1 tasks

    +
    +

    7.5.1 tasks

      -
    1. install the basic vdr packages
      +
    2. install the basic vdr packages
      ---
@@ -1429,7 +1442,7 @@ Allow the vdr user to restart vdr.service and reboot the system
      3. -
    3. Add svdrp/svdrp-disc to /etc/services
      +
    4. Add svdrp/svdrp-disc to /etc/services
      - name: add svdrp and svdrp-disc to /etc/services
@@ -1444,7 +1457,7 @@ Allow the vdr user to restart vdr.service and reboot the system
      5. -
    5. Set up the recording directory for the vdr user
      +
    6. Set up the recording directory for the vdr user
      - name: create vdr recdir
@@ -1479,7 +1492,7 @@ Allow the vdr user to restart vdr.service and reboot the system
      7. -
    7. Install additional vdr plugins
      +
    8. Install additional vdr plugins

      The additional plugins to install can be set in the variable {{vdr_plugins}} in the group variables @@ -1495,7 +1508,7 @@ The additional plugins to install can be set in the variable {{vdr_plugins

    • -
  • copy vdr configuration files (if they don’t exist yet)
    +
  • copy vdr configuration files (if they don’t exist yet)
    - name: ensure vdr is stopped
@@ -1526,7 +1539,7 @@ The additional plugins to install can be set in the variable {{vdr_plugins
    • -
  • start vdr after network-online.target
    +
  • start vdr after network-online.target
    - name: create directory for vdr.service systemd drop-in files
@@ -1547,8 +1560,8 @@ The additional plugins to install can be set in the variable {{vdr_plugins
    -
    -

    7.5.2 templates

    +
    +

    7.5.2 templates

    Start after network-online.target @@ -1560,12 +1573,12 @@ Start after network-online.target

    -
    -

    7.5.3 files

    +
    +

    7.5.3 files

      -
    1. remote.conf
      +
    2. remote.conf
      LIRC.Up KEY_UP
@@ -1700,7 +1713,7 @@ XKeySym.Next       XF86AudioNext
      3. -
    3. keymacros.conf
      +
    4. keymacros.conf
      # Remote control key macros for VDR
@@ -1726,12 +1739,12 @@ User0     @osdteletext
    -
    -

    7.6 STARTED yavdr-network

    +
    +

    7.6 STARTED yavdr-network

    -
    -

    7.6.1 default variables

    +
    +

    7.6.1 default variables

    install_avahi: true
@@ -1739,8 +1752,8 @@ User0     @osdteletext
    -
    -

    7.6.2 tasks

    +
    +

    7.6.2 tasks

    ---
@@ -1809,17 +1822,17 @@ User0     @osdteletext
    -
    -

    7.7 nfs-server

    +
    +

    7.7 nfs-server

    -
    -

    7.7.1 TODO avahi-services für NFS beim Stoppen des nfs-kernel-servers depublizieren, beim Start wieder announcen

    +
    +

    7.7.1 TODO avahi-services für NFS beim Stoppen des nfs-kernel-servers depublizieren, beim Start wieder announcen

    -
    -

    7.7.2 tasks

    +
    +

    7.7.2 tasks

    ---
@@ -1847,12 +1860,12 @@ User0     @osdteletext
    -
    -

    7.7.3 templates

    +
    +

    7.7.3 templates

      -
    1. /etc/exports
      +
    2. /etc/exports
      /srv *(rw,fsid=0,sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }})
@@ -1863,7 +1876,7 @@ User0     @osdteletext
      3. -
    3. avahi services
      +
    4. avahi services
      <?xml version="1.0" standalone='no'?>
@@ -1885,15 +1898,15 @@ User0     @osdteletext
      -
      -

      7.8 STARTED yavdr-remote

      +
      +

      7.8 STARTED yavdr-remote

      The role yavdr-remote sets up the foundation for using eventlircd, lircd2uinput and the pre-configuration for remote receivers which can be detected by udev.

      -
      -

      7.8.1 default variables

      +
      +

      7.8.1 default variables

      lircd0_socket: /var/run/lirc/lircd0
@@ -1901,8 +1914,8 @@ The role yavdr-remote sets up the foundation for using eventlircd,
      -
      -

      7.8.2 tasks

      +
      +

      7.8.2 tasks

      ---
@@ -1973,12 +1986,12 @@ The role yavdr-remote sets up the foundation for using eventlircd,
      -
      -

      7.8.3 templates

      +
      +

      7.8.3 templates

        -
      1. Systemd Drop-in to start vdr with lirc support
        +
      2. Systemd Drop-in to start vdr with lirc support
        {% if frontend != 'kodi' %}
@@ -1989,7 +2002,7 @@ The role yavdr-remote sets up the foundation for using eventlircd,
        3. -
      3. Systemd Drop-in to start lircd2uinput with lircd
        +
      4. Systemd Drop-in to start lircd2uinput with lircd
        [Service]
@@ -1999,7 +2012,7 @@ The role yavdr-remote sets up the foundation for using eventlircd,
        5. -
      5. create /etc/rc_maps.cfg
        +
      6. create /etc/rc_maps.cfg
        {{ ansible_managed | comment }}
@@ -2194,19 +2207,19 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
      -
      -

      7.8.4 files

      +
      +

      7.8.4 files

      -
      -

      7.9 pulseaudio

      +
      +

      7.9 pulseaudio

      -
      -

      7.9.1 tasks

      +
      +

      7.9.1 tasks

      ---
@@ -2228,8 +2241,8 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
      -
      -

      7.9.2 templates

      +
      +

      7.9.2 templates

      # Use PulseAudio by default
@@ -2252,12 +2265,12 @@ ati_remote    rc-medion-x10-digitainer   /lib/udev/rc_keymaps/rc-medion-x10-digi
      -
      -

      7.10 yavdr-xorg

      +
      +

      7.10 yavdr-xorg

      -
      -

      7.10.1 About the GUI session

      +
      +

      7.10.1 About the GUI session

      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. To simplify starting and stopping the X-server and the desktop session a yavdr-xorg.service is provided by the package yavdr-xorg, which depends on the two units mentioned before. @@ -2286,8 +2299,8 @@ In order to achive a clean shutdown of the session, x@t7.service is

      -
      -

      7.10.2 default variables

      +
      +

      7.10.2 default variables

      first_run: False
@@ -2310,12 +2323,12 @@ In order to achive a clean shutdown of the session, x@t7.service is
      -
      -

      7.10.3 tasks

      +
      +

      7.10.3 tasks

        -
      1. main.yml
        +
      2. main.yml
        ---
@@ -2328,7 +2341,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        3. -
      3. setup-xorg.yml
        +
      4. setup-xorg.yml
        ---
@@ -2440,7 +2453,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        5. -
      5. detect-xorg.yml
        +
      6. detect-xorg.yml
        ---
@@ -2600,7 +2613,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        7. -
      7. intel.yml
        +
      8. intel.yml

        KMS drivers (like for intel (i915) and amd (radeon)) require additional configuration beneath a customized xorg.conf - for a „static“ output configuration (which works if the TV or AV receiver is not turned on) we need to force loading the display(s) EDID early during the boot process. @@ -2647,12 +2660,12 @@ Please note that rescanning the connected displays works only after removing the

      -
      -

      7.10.4 templates

      +
      +

      7.10.4 templates

        -
      1. grub
        +
      2. grub
        {% set output_flag = 'D' if ("HDMI" in xorg.primary.connector or "DVI" in xorg.primary.connector or "DP" in xorg.primary.connector) else 'e' %} 
@@ -2662,11 +2675,11 @@ Please note that rescanning the connected displays works only after removing the
        3. -
      3. xorg
        +
      4. xorg
          -
        1. x-verbose@.service
          +
        2. x-verbose@.service
          # file: roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2
@@ -2682,7 +2695,7 @@ Please note that rescanning the connected displays works only after removing the
          3. -
        3. Drop-in snippet for x@.service
          +
        4. Drop-in snippet for x@.service
          [Unit]
@@ -2708,7 +2721,7 @@ Please note that rescanning the connected displays works only after removing the
          5. -
        5. Drop-in snippet for vdr.service
          +
        6. Drop-in snippet for vdr.service
          {{ ansible_managed | comment }}
@@ -2720,7 +2733,7 @@ Please note that rescanning the connected displays works only after removing the
          7. -
        7. xorg.conf snippets
          +
        8. xorg.conf snippets
          {{ ansible_managed | comment }}
@@ -2734,7 +2747,7 @@ EndSection
          9. -
        9. xorg.conf
          +
        10. xorg.conf
          Section "Device"
@@ -3060,7 +3073,7 @@ EndSection
        5. -
      5. vdr
        +
      6. vdr

        Set environment variables for system locale and user session on startup @@ -3076,12 +3089,12 @@ Set environment variables for system locale and user session on startup

      -
      -

      7.10.5 files

      +
      +

      7.10.5 files

        -
      1. initramfs EDID hook
        +
      2. initramfs EDID hook
        #!/bin/bash
@@ -3107,16 +3120,16 @@ manual_add_modules i915 radeon
        -
        -

        7.11 yavdr-desktop

        +
        +

        7.11 yavdr-desktop

        -
        -

        7.11.1 Tasks

        +
        +

        7.11.1 Tasks

          -
        1. main.yml
          +
        2. main.yml
          ---
@@ -3283,16 +3296,16 @@ manual_add_modules i915 radeon
        -
        -

        7.11.2 Templates

        +
        +

        7.11.2 Templates

          -
        1. xorg configuration
          +
        2. xorg configuration
            -
          1. .Xresources
            +
          2. .Xresources
            xterm*background: Black
@@ -3315,7 +3328,7 @@ XTerm.vt100.font: 7x13
            3. -
          3. .xinitrc
            +
          4. .xinitrc
            #!/bin/bash
@@ -3327,11 +3340,11 @@ XTerm.vt100.font: 7x13
          3. -
        3. openbox
          +
        4. openbox
            -
          1. autostart
            +
          2. autostart
            # forward environment variables to an environment file and the systemd user session
@@ -3367,7 +3380,7 @@ systemctl --user isolate yavdr-desktop.target
            3. -
          3. rc.xml
            +
          4. rc.xml
            <?xml version="1.0" encoding="UTF-8"?>
@@ -4193,7 +4206,7 @@ systemctl --user isolate yavdr-desktop.target
            5. -
          5. rc2.xml
            +
          6. rc2.xml
            <?xml version="1.0" encoding="UTF-8"?>
@@ -5022,11 +5035,11 @@ systemctl --user isolate yavdr-desktop.target
          5. -
        5. Systemd User Session
          +
        6. Systemd User Session
            -
          1. yavdr-desktop.target
            +
          2. yavdr-desktop.target
            [Unit]
@@ -5039,7 +5052,7 @@ systemctl --user isolate yavdr-desktop.target
            3. -
          3. detect-second-display
            +
          4. detect-second-display
            #!/bin/bash
@@ -5068,7 +5081,7 @@ systemctl --user isolate yavdr-desktop.target
            5. -
          5. switch-displays
            +
          6. switch-displays

            This script exchanges the primary and secondary screen. It needs access to the systemd user session. @@ -5087,7 +5100,7 @@ frontend-dbus-send start

        3. -
      3. openbox-second.service
        +
      4. openbox-second.service
        [Unit]
@@ -5109,7 +5122,7 @@ frontend-dbus-send start
        5. -
      5. osd2web.service
        +
      6. osd2web.service
        [Unit]
@@ -5132,7 +5145,7 @@ frontend-dbus-send start
        7. -
      7. tmux.service
        +
      8. tmux.service
        [Unit]
@@ -5151,7 +5164,7 @@ frontend-dbus-send start
        9. -
      9. wm-exit.service
        +
      10. wm-exit.service
        [Unit]
@@ -5170,7 +5183,7 @@ frontend-dbus-send start
      5. -
    5. irexec
      +
    6. irexec

      irexec.service starts irexec for the user session @@ -5204,12 +5217,12 @@ end

    -
    -

    7.12 samba-install

    +
    +

    7.12 samba-install

    -
    -

    7.12.1 tasks

    +
    +

    7.12.1 tasks

    ---
@@ -5230,12 +5243,12 @@ end
    -
    -

    7.13 samba-config

    +
    +

    7.13 samba-config

    -
    -

    7.13.1 tasks

    +
    +

    7.13.1 tasks

    ---
@@ -5260,16 +5273,16 @@ end
    -
    -

    7.13.2 templates

    +
    +

    7.13.2 templates

      -
    1. smb.conf
      +
    2. smb.conf
        -
      1. global settings
        +
      2. global settings
        {{ ansible_managed | comment }}
@@ -5355,7 +5368,7 @@ end
        3. -
      3. media directories
        +
      4. media directories
        {% for name, path in media_dirs.iteritems() %}
@@ -5377,7 +5390,7 @@ end
        5. -
      5. include custom samba exports
        +
      6. include custom samba exports
        include = /etc/samba/smb.conf.custom
@@ -5390,15 +5403,15 @@ end
    -
    -

    7.14 STARTED autoinstall-drivers

    +
    +

    7.14 STARTED autoinstall-drivers

    It would be nice to be able to detect if it is suitable to install those drivers:

    -
    -

    7.14.1 TODO sundtek for Sundtek devices (local or network connection)

    +
    +

    7.14.1 TODO sundtek for Sundtek devices (local or network connection)

    Vendor-IDs: @@ -5409,7 +5422,7 @@ Vendor-IDs:

      -
    1. planned packages
      +
    2. planned packages
      • yavdr-hardware-sundtek
        • @@ -5420,8 +5433,8 @@ Vendor-IDs:
    -
    -

    7.14.2 TODO drivers for TT S2-6400 FF

    +
    +

    7.14.2 TODO drivers for TT S2-6400 FF

    https://github.com/s-moch/linux-saa716x - kann man den relevanten Teil als dkms-Paket bauen? @@ -5429,15 +5442,15 @@ Vendor-IDs:

    -
    -

    7.15 autoinstall-ubuntu-drivers

    +
    +

    7.15 autoinstall-ubuntu-drivers

    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.

    -
    -

    7.15.1 tasks

    +
    +

    7.15.1 tasks

    ---
@@ -5460,8 +5473,8 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
    -
    -

    7.16 autoinstall-virtualbox-guest

    +
    +

    7.16 autoinstall-virtualbox-guest

    This role installs the guest additions for virtualbox guests on Ubuntu 16.04 @@ -5510,12 +5523,12 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04

    -
    -

    7.17 autoinstall-atric-usb

    +
    +

    7.17 autoinstall-atric-usb

    -
    -

    7.17.1 dependencies

    +
    +

    7.17.1 dependencies

    ---
@@ -5527,8 +5540,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
    -
    -

    7.17.2 tasks

    +
    +

    7.17.2 tasks

    ---
@@ -5570,8 +5583,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
    -
    -

    7.17.3 templates

    +
    +

    7.17.3 templates

    {{ ansible_managed | comment }}
@@ -5600,12 +5613,12 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
    -
    -

    7.18 autoinstall-yausbir

    +
    +

    7.18 autoinstall-yausbir

    -
    -

    7.18.1 dependencies

    +
    +

    7.18.1 dependencies

    ---
@@ -5616,8 +5629,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
    -
    -

    7.18.2 tasks

    +
    +

    7.18.2 tasks

    ---
@@ -5659,8 +5672,8 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
    -
    -

    7.18.3 templates

    +
    +

    7.18.3 templates

    {{ ansible_managed | comment }}
@@ -5688,15 +5701,15 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
    -
    -

    7.19 autoinstall-satip

    +
    +

    7.19 autoinstall-satip

    If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip is installed.

    -
    -

    7.19.1 tasks

    +
    +

    7.19.1 tasks

    ---
@@ -5721,12 +5734,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.20 autoinstall-targavfd

    +
    +

    7.20 autoinstall-targavfd

    -
    -

    7.20.1 tasks

    +
    +

    7.20.1 tasks

    ---
@@ -5742,12 +5755,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.21 autoinstall-imonlcd

    +
    +

    7.21 autoinstall-imonlcd

    -
    -

    7.21.1 tasks

    +
    +

    7.21.1 tasks

    ---
@@ -5763,12 +5776,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.22 autoinstall-libcecdaemon

    +
    +

    7.22 autoinstall-libcecdaemon

    -
    -

    7.22.1 tasks

    +
    +

    7.22.1 tasks

    ---
@@ -5784,12 +5797,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.23 autoinstall-pvr350

    +
    +

    7.23 autoinstall-pvr350

    -
    -

    7.23.1 tasks

    +
    +

    7.23.1 tasks

    ---
@@ -5805,8 +5818,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.24 autoinstall-hauppauge-pvr

    +
    +

    7.24 autoinstall-hauppauge-pvr

    ---
@@ -5821,12 +5834,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.25 autoinstall-firmware

    +
    +

    7.25 autoinstall-firmware

    -
    -

    7.25.1 dependencies

    +
    +

    7.25.1 dependencies

    ---
@@ -5837,8 +5850,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.25.2 tasks

    +
    +

    7.25.2 tasks

    ---
@@ -5879,12 +5892,12 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.26 autoinstall-dvbsky-firmware

    +
    +

    7.26 autoinstall-dvbsky-firmware

    -
    -

    7.26.1 dependencies

    +
    +

    7.26.1 dependencies

    ---
@@ -5895,8 +5908,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.26.2 defaults

    +
    +

    7.26.2 defaults

    ---
@@ -5906,8 +5919,8 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.26.3 tasks

    +
    +

    7.26.3 tasks

    ---
@@ -5957,15 +5970,15 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
    -
    -

    7.27 TODO autoinstall-dvbhddevice

    +
    +

    7.27 TODO autoinstall-dvbhddevice

    Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware sollte in yavdr-firmware stecken

    -
    -

    7.27.1 dependencies

    +
    +

    7.27.1 dependencies

    ---
@@ -5976,8 +5989,8 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
    -
    -

    7.27.2 tasks

    +
    +

    7.27.2 tasks

    ---
@@ -5994,12 +6007,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
    -
    -

    7.28 autoinstall-dvbsddevice

    +
    +

    7.28 autoinstall-dvbsddevice

    -
    -

    7.28.1 dependencies

    +
    +

    7.28.1 dependencies

    ---
@@ -6010,8 +6023,8 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
    -
    -

    7.28.2 tasks

    +
    +

    7.28.2 tasks

    ---
@@ -6029,12 +6042,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
    -
    -

    7.29 autoinstall-hardware-irmp

    +
    +

    7.29 autoinstall-hardware-irmp

    -
    -

    7.29.1 dependencies

    +
    +

    7.29.1 dependencies

    ---
@@ -6045,8 +6058,8 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
    -
    -

    7.29.2 tasks

    +
    +

    7.29.2 tasks

    ---
@@ -6062,30 +6075,30 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
    -
    -

    7.30 Serial IR Receivers

    +
    +

    7.30 Serial IR Receivers

    -This role preconfigures the system for serial „homebrew“ receivers. Newer kernel versions provide serial_ir which acts as a rc-core driver, so we don’t need lircd (it works with eventircd OOTB). +This role preconfigures the system for serial „homebrew“ receivers. Newer kernel versions provide serial_ir which acts as a rc-core driver, so we don’t need lircd - eventlircd can use the device directly.

    -As configured in the role yavdr-remote (/etc/rc_maps.cfg) a keytable for a RC-6 MCE remote is loaded by default. You can choose a different keymap which may use another ir-protocol. +As configured in the role yavdr-remote (/etc/rc_maps.cfg) a keytable for a RC-6 MCE remote is loaded by default. You can choose a different keymap which may also use another ir-protocol.

    -
    -

    7.30.1 defaults

    +
    +

    7.30.1 defaults

    ---
-serial_device: ttyS0
+serial_ir_device: ttyS0
    -
    -

    7.30.2 tasks

    +
    +

    7.30.2 tasks

    ---
@@ -6112,12 +6125,12 @@ As configured in the role yavdr-remote (/etc/rc_maps.cfg
    -
    -

    7.30.3 templates

    +
    +

    7.30.3 templates

      -
    1. load serial_ir on startup
      +
    2. load serial_ir on startup
      serial_ir
@@ -6125,28 +6138,28 @@ As configured in the role yavdr-remote (/etc/rc_maps.cfg
      3. -
    3. serial_ir module options
      +
    4. serial_ir module options
      #COM1 equivalent, /dev/ttyS0
-{% if serial_device == "ttyS0" %}
+{% if serial_ir_device == "ttyS0" %}
 options serial_ir irq=4 io=0x3f8
-{% elif serial_device == "ttyS1" %}
+{% elif serial_ir_device == "ttyS1" %}
 #COM2 equivalent, /dev/ttyS1
 options serial_ir irq=3 io=0x2f8
 {% endif %}
-install serial_ir setserial /dev/{{serial_device}} uart none; /sbin/modprobe --ignore-install serial_ir
+install serial_ir setserial /dev/{{serial_ir_device}} uart none; /sbin/modprobe --ignore-install serial_ir
      5. -
    5. setserial options
      +
    6. setserial options
      -
      {% if serial_device == "ttyS0" %}
+
      {% if serial_ir_device == "ttyS0" %}
 #COM1 equivalent, /dev/ttyS0
 /dev/ttyS0 uart none
-{% elif serial_device == "ttyS1" %}
+{% elif serial_ir_device == "ttyS1" %}
 #COM2 equivalent, /dev/ttyS1
 /dev/ttyS1 uart none
 {% endif %}
@@ -6157,21 +6170,21 @@ install serial_ir setserial /dev/{{
-
      7.31 kodi
      
+
      
+
      7.31 kodi
      
 
      
 
      
-
      
-
      7.31.1 tasks
      
+
      
+
      7.31.1 tasks
      
 
      
 
      
 
        
-
      1. Install KODI
        
+
      2. Install KODI
        
 
        
 
        
 
          
-
        • main.yml
          
-
          
+
        • main.yml
          
+
          
 
          
 
          - import_tasks: install-kodi.yml
   tags:
@@ -6187,7 +6200,7 @@ install serial_ir setserial /dev/{{install-kodi.yml
          
+
        • install-kodi.yml
          
 
          
 
          
 
          ---
@@ -6218,7 +6231,7 @@ install serial_ir setserial /dev/{{configure-kodi.yml
          
+
        • configure-kodi.yml
          
 
          
 
          
 
          - name: create kodi.service for the user session
@@ -6267,12 +6280,12 @@ install serial_ir setserial /dev/{{
-
          7.31.2 templates
          
+
          
+
          7.31.2 templates
          
 
          
 
          
 
            
-
          1. kodi.service
            
+
          2. kodi.service
            
 
            
 
            
 This systemd unit for the user session starts (and stops) kodi.
@@ -6297,15 +6310,15 @@ This systemd unit for the user session starts (and stops) kodi.
 
          
 
          
 
-
          
-
          7.31.3 files
          
+
          
+
          7.31.3 files
          
 
          
 
          
 Those configuration files provide a preconfiguration for kodi which overrides the system wide configuration
 
          
 
          
 
            
-
          1. Lircmap.xml
            
+
          2. Lircmap.xml
            
 
            
 
            
 This file allows to map keys sent by remotes via eventlircd (which uses the name devinput) to kodi key names.
@@ -6376,14 +6389,14 @@ This file allows to map keys sent by remotes via eventlircd (which uses the name
 
            
 
          
 
          • 
-
        • keymaps
          
+
        • keymaps
          
 
          
 
          
 This file maps the keys defined in Lircmap.xml to actions within kodi.
 
          
 
          
 
            
-
          1. remote.xml
            
+
          2. remote.xml
            
 
            
 
            
 
            <?xml version="1.0" encoding="UTF-8"?>
@@ -6935,17 +6948,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
 
          
 
          • 
 
          
-
          
-
          7.32 dvd
          
+
          
+
          7.32 dvd
          
 
          
 
          
-
          
-
          7.32.1 tasks
          
+
          
+
          7.32.1 tasks
          
 
          
 
          
 
            
-
          • install libdvd-pkg, allow programs to eject optical media
            
-
            
+
          • install libdvd-pkg, allow programs to eject optical media
            
+
            
 
            
 
            ---
 # file: roles/dvd/tasks/main.yml
@@ -6984,17 +6997,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
 
          
 
          
 
          
-
          
-
          7.33 install-sundtek
          
+
          
+
          7.33 install-sundtek
          
 
          
 
          
-
          
-
          7.33.1 variables
          
+
          
+
          7.33.1 variables
          
 
          
 
          
 
          
-
          
-
          7.33.2 tasks
          
+
          
+
          7.33.2 tasks
          
 
          
 
          
 
          ---
@@ -7043,12 +7056,12 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
 
          
 
          
 
          
-
          
-
          7.33.3 templates
          
+
          
+
          7.33.3 templates
          
 
          
 
          
 
            
-
          1. /etc/sundtek.conf
            
+
          2. /etc/sundtek.conf
            
 
            
 
            
 
            # ----- GLOBAL SECTION -----
@@ -7153,7 +7166,7 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
 
            
 
            
 
            3. 
-
          3. Overrides for systemd unit sundtek.service
            
+
          4. Overrides for systemd unit sundtek.service
            
 
            
 
              
 
            • [ ] wait for network
              • 
@@ -7164,8 +7177,8 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
 
          
 
          
 
          
-
          
-
          7.34 template-test
          
+
          
+
          7.34 template-test
          
 
          
 
          
 
          ---
@@ -7406,12 +7419,12 @@ EndSection
 
          
 
          
 
          
-
          
-
          7.35 wakeup
          
+
          
+
          7.35 wakeup
          
 
          
 
          
-
          
-
          7.35.1 defaults
          
+
          
+
          7.35.1 defaults
          
 
          
 
          
 
          ---
@@ -7421,8 +7434,8 @@ EndSection
 
          
 
          
 
          
-
          
-
          7.35.2 tasks
          
+
          
+
          7.35.2 tasks
          
 
          
 
          
 
          ---
@@ -7443,8 +7456,8 @@ EndSection
 
          
 
          
 
          
-
          
-
          7.35.3 templates
          
+
          
+
          7.35.3 templates
          
 
          
 
          
 
          {{ ansible_managed | comment }}
@@ -7470,12 +7483,12 @@ ACPI_START_AHEAD=5
 
          
 
          
 
-
          
-
          7.36 grub-config
          
+
          
+
          7.36 grub-config
          
 
          
 
          
-
          
-
          7.36.1 default variables
          
+
          
+
          7.36.1 default variables
          
 
          
 
          
 
          system:
@@ -7487,8 +7500,8 @@ ACPI_START_AHEAD=5
 
          
 
          
 
          
-
          
-
          7.36.2 tasks
          
+
          
+
          7.36.2 tasks
          
 
          
 
          
 
          ---
@@ -7513,8 +7526,8 @@ ACPI_START_AHEAD=5
 
          
 
          
 
          
-
          
-
          7.36.3 templates
          
+
          
+
          7.36.3 templates
          
 
          
 
          
 
          #!/bin/sh
@@ -7537,8 +7550,8 @@ menuentry "PowerOff" 
-
          7.36.4 handlers
          
+
          
+
          7.36.4 handlers
          
 
          
 
          
 
          ---
@@ -7561,15 +7574,15 @@ menuentry "PowerOff" 
-
          8 Modules
          
+
          
+
          8 Modules
          
 
          
 
          
 This section contains custom modules for the yaVDR Playbooks. They are used to collect facts about the system and configure applications and daemons.
 
          
 
          
-
          
-
          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.
@@ -7747,8 +7760,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
          
 
          
 
          
-
          
-
          8.2 pci_facts.py
          
+
          
+
          8.2 pci_facts.py
          
 
          
 
          
 
          @@ -7824,8 +7837,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
          
 
          
 
          
-
          
-
          8.3 satip_facts.py
          
+
          
+
          8.3 satip_facts.py
          
 
          
 
          
 
          DOCUMENTATION = '''
@@ -7949,8 +7962,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
          
 
          
 
          
-
          
-
          8.4 xrandr_facts.py
          
+
          
+
          8.4 xrandr_facts.py
          
 
          
 
            
 
          • [ ] support multiple screens (-d :0.0 .. :0.n)
            • 
@@ -8238,8 +8251,8 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
          
 
          
 
          
-
          
-
          9 Handlers
          
+
          
+
          9 Handlers
          
 
          
 
          
 
          - name: Reconfigure unattended upgrades with dpkg
@@ -8332,7 +8345,7 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
 
          
 
          
 
          Autor: Alexander Grothe <seahawk1986@gmx.de>
          
-
          Created: 2019-01-01 Di 23:47
          
+
          Created: 2019-01-02 Mi 09:25
          
 
          Validate
          
 
          
 
diff --git a/Manual.org b/Manual.org
index 035cb42..1dc96fd 100644
--- a/Manual.org
+++ b/Manual.org
@@ -262,6 +262,7 @@ The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation:
      - autoinstall-yausbir        # preconfigure lircd for yaUsbIR receiver
      - autoinstall-dvbsky-firmware # download and install required firmware files for dvbsky cards
      - autoinstall-firmware       # download and install firmware files for dvb devices
+     #- serial-ir                  # configure a serial port for "homebrew" ir receivers (e.g. Atric V5)
      - kodi
      - dvd                        # set up packages and a udev rule to allow kodi and other players
                                   # to play and eject optical media
@@ -421,6 +422,12 @@ grub:
   timeout: 0
   boot_options: quiet splash
 #+END_SRC
+** Serial IR
+#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
+# Serial device to configure for a homebrew receiver.
+# Choose either ttyS0 (COM1) or ttyS1 (COM2)
+serial_ir_device = ttyS0
+#+END_SRC
 * Roles
 :PROPERTIES:
 :ID:       50ac2e79-c494-4a32-8632-313d49bdb2b7
@@ -5716,13 +5723,13 @@ dependencies:
   when: '"1209:4444" in usb or "16c0:27d9" in usb'
 #+END_SRC
 ** Serial IR Receivers
-This role preconfigures the system for serial "homebrew" receivers. Newer kernel versions provide ~serial_ir~ which acts as a rc-core driver, so we don't need lircd (it works with eventircd OOTB).
+This role preconfigures the system for serial "homebrew" receivers. Newer kernel versions provide ~serial_ir~ which acts as a rc-core driver, so we don't need lircd - eventlircd can use the device directly.
 
-As configured in the role yavdr-remote ([[*create /etc/rc_maps.cfg][/etc/rc_maps.cfg]]) a keytable for a RC-6 MCE remote is loaded by default. You can choose a different keymap which may use another ir-protocol.
+As configured in the role yavdr-remote ([[*create /etc/rc_maps.cfg][/etc/rc_maps.cfg]]) a keytable for a RC-6 MCE remote is loaded by default. You can choose a different keymap which may also use another ir-protocol.
 *** defaults
 #+BEGIN_SRC yaml :tangle roles/serial-ir/defaults/main.yml
 ---
-serial_device: ttyS0
+serial_ir_device: ttyS0
 #+END_SRC
 
 *** tasks
@@ -5756,20 +5763,20 @@ serial_ir
 **** serial_ir module options
 #+BEGIN_SRC jinja2 :tangle roles/serial-ir/templates/modprobe.d/serial_ir.conf.j2
 #COM1 equivalent, /dev/ttyS0
-{% if serial_device == "ttyS0" %}
+{% if serial_ir_device == "ttyS0" %}
 options serial_ir irq=4 io=0x3f8
-{% elif serial_device == "ttyS1" %}
+{% elif serial_ir_device == "ttyS1" %}
 #COM2 equivalent, /dev/ttyS1
 options serial_ir irq=3 io=0x2f8
 {% endif %}
-install serial_ir setserial /dev/{{serial_device}} uart none; /sbin/modprobe --ignore-install serial_ir
+install serial_ir setserial /dev/{{serial_ir_device}} uart none; /sbin/modprobe --ignore-install serial_ir
 #+END_SRC
 **** setserial options
 #+BEGIN_SRC jinja2 :tangle roles/serial-ir/templates/serial.conf.j2
-{% if serial_device == "ttyS0" %}
+{% if serial_ir_device == "ttyS0" %}
 #COM1 equivalent, /dev/ttyS0
 /dev/ttyS0 uart none
-{% elif serial_device == "ttyS1" %}
+{% elif serial_ir_device == "ttyS1" %}
 #COM2 equivalent, /dev/ttyS1
 /dev/ttyS1 uart none
 {% endif %}
diff --git a/group_vars/all b/group_vars/all
index 5b87327..e38f025 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -57,3 +57,6 @@ wakeup_method: acpiwakeup
 grub:
   timeout: 0
   boot_options: quiet splash
+# Serial device to configure for a homebrew receiver.
+# Choose either ttyS0 (COM1) or ttyS1 (COM2)
+serial_ir_device = ttyS0
diff --git a/roles/serial-ir/defaults/main.yml b/roles/serial-ir/defaults/main.yml
index f4a05a8..31d6069 100644
--- a/roles/serial-ir/defaults/main.yml
+++ b/roles/serial-ir/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-serial_device: ttyS0
+serial_ir_device: ttyS0
diff --git a/roles/serial-ir/templates/modprobe.d/serial_ir.conf.j2 b/roles/serial-ir/templates/modprobe.d/serial_ir.conf.j2
index e7e2c59..1a02548 100644
--- a/roles/serial-ir/templates/modprobe.d/serial_ir.conf.j2
+++ b/roles/serial-ir/templates/modprobe.d/serial_ir.conf.j2
@@ -1,8 +1,8 @@
 #COM1 equivalent, /dev/ttyS0
-{% if serial_device == "ttyS0" %}
+{% if serial_ir_device == "ttyS0" %}
 options serial_ir irq=4 io=0x3f8
-{% elif serial_device == "ttyS1" %}
+{% elif serial_ir_device == "ttyS1" %}
 #COM2 equivalent, /dev/ttyS1
 options serial_ir irq=3 io=0x2f8
 {% endif %}
-install serial_ir setserial /dev/{{serial_device}} uart none; /sbin/modprobe --ignore-install serial_ir
+install serial_ir setserial /dev/{{serial_ir_device}} uart none; /sbin/modprobe --ignore-install serial_ir
diff --git a/roles/serial-ir/templates/serial.conf.j2 b/roles/serial-ir/templates/serial.conf.j2
index 7466f80..a7555e5 100644
--- a/roles/serial-ir/templates/serial.conf.j2
+++ b/roles/serial-ir/templates/serial.conf.j2
@@ -1,7 +1,7 @@
-{% if serial_device == "ttyS0" %}
+{% if serial_ir_device == "ttyS0" %}
 #COM1 equivalent, /dev/ttyS0
 /dev/ttyS0 uart none
-{% elif serial_device == "ttyS1" %}
+{% elif serial_ir_device == "ttyS1" %}
 #COM2 equivalent, /dev/ttyS1
 /dev/ttyS1 uart none
 {% endif %}
diff --git a/yavdr07.yml b/yavdr07.yml
index 947144a..85a6b9a 100644
--- a/yavdr07.yml
+++ b/yavdr07.yml
@@ -32,6 +32,7 @@
      - autoinstall-yausbir        # preconfigure lircd for yaUsbIR receiver
      - autoinstall-dvbsky-firmware # download and install required firmware files for dvbsky cards
      - autoinstall-firmware       # download and install firmware files for dvb devices
+     #- serial-ir                  # configure a serial port for "homebrew" ir receivers (e.g. Atric V5)
      - kodi
      - dvd                        # set up packages and a udev rule to allow kodi and other players
                                   # to play and eject optical media