From 9060429ba691fe027dfcbb29c7b39f9e511ac6af Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Mon, 20 Nov 2017 09:45:15 +0100 Subject: [PATCH] create extra role for wakeup configuration --- Manual.html | 795 ++++++++++-------- Manual.org | 33 +- group_vars/all | 2 +- .../autoinstall-hardware-irmp/tasks/main.yml | 1 + roles/autoinstall-satip/tasks/main.yml | 1 + roles/wakeup/defaults/main.yml | 3 + roles/wakeup/tasks/main.yml | 15 + roles/yavdr-common/tasks/main.yml | 3 - yavdr07-headless.yml | 1 + yavdr07.yml | 1 + 10 files changed, 476 insertions(+), 379 deletions(-) create mode 100644 roles/wakeup/defaults/main.yml create mode 100644 roles/wakeup/tasks/main.yml diff --git a/Manual.html b/Manual.html index 366ec03..f0d98de 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,217 +240,223 @@ 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. @@ -483,22 +489,22 @@ 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 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. @@ -520,8 +526,8 @@ sudo ./install-yavdr.sh

-
-

3.1 Install script for local usage

+
+

3.1 Install script for local usage

if (( $EUID != 0 )); then
@@ -544,12 +550,12 @@ ansible-playbook yavdr07.yml -b -i 'localhost_inventory
-
-

4 Playbooks

+
+

4 Playbooks

-
-

4.1 yavdr07.yml

+
+

4.1 yavdr07.yml

The yavdr07.yml playbook sets up a fully-featured yaVDR installation: @@ -587,6 +593,7 @@ The yavdr07.yml playbook sets up a fully-featured yaVDR installatio - kodi - dvd # set up packages and a udev rule to allow kodi and other players # to play and eject optical media + - wakeup # set up wakeup methods for rtc etc. - grub-config # configure grub tags: - always @@ -597,8 +604,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 @@ -621,6 +628,7 @@ For a headless server installation yavdr07-headless.yml is a good c - nfs-server - grub-config - autoinstall-satip + - wakeup tags: - always handlers: @@ -630,8 +638,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: @@ -645,12 +653,12 @@ This playbook can either be used to run the installation on the localhost or any

-
-

6 Group Variables

+
+

6 Group Variables

-
-

6.1 default text for templates used by ansible

+
+

6.1 default text for templates used by ansible

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

6.2 PPAs

+
+

6.2 PPAs

branch: unstable
@@ -679,8 +687,8 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.3 VDR user, directories, special configuration and plugins

+
+

6.3 VDR user, directories, special configuration and plugins

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

6.4 Media directories

+
+

6.4 Media directories

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

6.5 NFS

+
+

6.5 NFS

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

6.6 Samba

+
+

6.6 Samba

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

6.7 Additional packages

+
+

6.7 Additional packages

# additional packages you want to install
@@ -754,20 +762,20 @@ This playbook can either be used to run the installation on the localhost or any
   - bpython3
   - htop
   - tree
-  - vdr-addon-acpiwakeup
   - vim
   - w-scan
-
-

6.8 System pre-configuration

+
+

6.8 System pre-configuration

frontend: vdr
 #system:
 #  shutdown: poweroff
+wakeup_method: acpiwakeup
 grub:
   timeout: 0
   boot_options: quiet nosplash
@@ -776,20 +784,20 @@ This playbook can either be used to run the installation on the localhost or any
-
-

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
    ---
@@ -809,19 +817,19 @@ This playbook can either be used to run the installation on the localhost or any
    -
    -

    7.2 nvidia-387 drivers

    +
    +

    7.2 nvidia-387 drivers

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

    -
    -

    7.2.1 tasks

    +
    +

    7.2.1 tasks

      -
    1. main.yml
      +
    2. main.yml
      ---
@@ -847,15 +855,15 @@ install nvidia-387 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. @@ -868,7 +876,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. @@ -885,7 +893,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. @@ -898,7 +906,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 @@ -912,7 +920,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. @@ -945,15 +953,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
      ---
@@ -969,7 +977,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: @@ -986,7 +994,7 @@ This task prevents apt to automatically install all recommended dependencies for

    -
  • Set up package repositories
    +
  • Set up package repositories
    - name: add PPAs
@@ -1004,7 +1012,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
@@ -1016,8 +1024,8 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create user vdr
    • -
  • Disable release-upgrade notifications
    +
  • create user vdr
    • +
  • Disable release-upgrade notifications
    - name: disable release-upgrade notifications
@@ -1031,7 +1039,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Install essential packages
    +
  • Install essential packages
    - name: apt | install basic packages
@@ -1063,7 +1071,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
@@ -1077,13 +1085,13 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create media directories
    • +
  • create media directories
    • -
    -

    7.3.3 templates

    +
    +

    7.3.3 templates

    {{ ansible_managed_file | comment('c') }}
@@ -1095,16 +1103,16 @@ APT::Install-Suggests "0";
    -
    -

    7.4 collect facts about the system with custom modules

    +
    +

    7.4 collect facts about the system with custom modules

    -
    -

    7.4.1 tasks

    +
    +

    7.4.1 tasks

      -
    1. main.yml
      +
    2. main.yml
      - name: get information about usb and pci hardware and loaded kernel modules
@@ -1131,16 +1139,16 @@ APT::Install-Suggests "0";
    -
    -

    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
      ---
@@ -1159,7 +1167,7 @@ APT::Install-Suggests "0";
      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
@@ -1174,7 +1182,7 @@ APT::Install-Suggests "0";
      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
@@ -1210,7 +1218,7 @@ APT::Install-Suggests "0";
      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 @@ -1228,7 +1236,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
@@ -1261,15 +1269,15 @@ The additional plugins to install can be set in the variable {{vdr_plugins
    -
    -

    7.5.2 templates

    +
    +

    7.5.2 templates

    -
    -

    7.5.3 files

    +
    +

    7.5.3 files

      -
    1. remote.conf
      +
    2. remote.conf
      LIRC.Up KEY_UP
@@ -1404,7 +1412,7 @@ XKeySym.Next       XF86AudioNext
      3. -
    3. keymacros.conf
      +
    4. keymacros.conf
      # Remote control key macros for VDR
@@ -1430,12 +1438,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
@@ -1443,8 +1451,8 @@ User0     @osdteletext
    -
    -

    7.6.2 tasks

    +
    +

    7.6.2 tasks

    ---
@@ -1514,15 +1522,15 @@ 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

    ---
@@ -1551,12 +1559,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 }})
@@ -1567,7 +1575,7 @@ User0     @osdteletext
      3. -
    3. avahi services
      +
    4. avahi services
      <?xml version="1.0" standalone='no'?>
@@ -1588,15 +1596,15 @@ User0     @osdteletext
    -
    -

    7.8 STARTED yavdr-remote

    +
    +

    7.8 STARTED yavdr-remote

    -
    -

    7.8.1 default variables

    +
    +

    7.8.1 default variables

    -
    -

    7.8.2 tasks

    +
    +

    7.8.2 tasks

    ---
@@ -1647,8 +1655,8 @@ User0     @osdteletext
    -
    -

    7.8.3 templates

    +
    +

    7.8.3 templates

    {% if frontend != 'kodi' %}
@@ -1659,17 +1667,17 @@ User0     @osdteletext
    -
    -

    7.8.4 files

    +
    +

    7.8.4 files

    -
    -

    7.9 pulseaudio

    +
    +

    7.9 pulseaudio

    -
    -

    7.9.1 tasks

    +
    +

    7.9.1 tasks

    ---
@@ -1691,8 +1699,8 @@ User0     @osdteletext
    -
    -

    7.9.2 templates

    +
    +

    7.9.2 templates

    # Use PulseAudio by default
@@ -1714,12 +1722,12 @@ User0     @osdteletext
    -
    -

    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. @@ -1747,11 +1755,11 @@ In order to achive a clean shutdown of the session, x@t7.service is

    -
    -

    7.10.2 default variables

    +
    +

    7.10.2 default variables

    -
    -

    7.10.3 tasks

    +
    +

    7.10.3 tasks

    ---
@@ -2008,14 +2016,14 @@ In order to achive a clean shutdown of the session, x@t7.service is
    -
    -

    7.10.4 templates

    +
    +

    7.10.4 templates

      -
    1. xorg
      +
    2. xorg
        -
      1. x-verbose@.service
        +
      2. x-verbose@.service
        # file: roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2
@@ -2031,7 +2039,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        3. -
      3. Drop-in snippet for x@.service
        +
      4. Drop-in snippet for x@.service
        [Unit]
@@ -2052,7 +2060,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        5. -
      5. Drop-in snippet for vdr.service
        +
      6. Drop-in snippet for vdr.service
        # file: roles/yavdr-xorg/templates/vdr-xorg.conf
@@ -2065,7 +2073,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        7. -
      7. .xinitrc
        +
      8. .xinitrc
        #!/bin/bash
@@ -2075,7 +2083,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
        9. -
      9. xorg.conf
        +
      10. xorg.conf
        Section "Device"
@@ -2402,7 +2410,7 @@ EndSection
      3. -
    3. vdr
      +
    4. vdr
      [Service]
@@ -2412,9 +2420,9 @@ EndSection
      5. -
    5. Systemd User Session
      +
    6. Systemd User Session
        -
      1. yavdr-desktop.target
        +
      2. yavdr-desktop.target
        [Unit]
@@ -2428,7 +2436,7 @@ EndSection
        3. -
      3. detect-second-display
        +
      4. detect-second-display
        [Unit]
@@ -2444,7 +2452,7 @@ EndSection
        5. -
      5. openbox-second.service
        +
      6. openbox-second.service
        [Unit]
@@ -2465,7 +2473,7 @@ EndSection
        7. -
      7. osd2web.service
        +
      8. osd2web.service
        [Unit]
@@ -2486,7 +2494,7 @@ EndSection
        9. -
      9. tmux.service
        +
      10. tmux.service
        [Unit]
@@ -2505,7 +2513,7 @@ EndSection
        11. -
      11. wm-exit.service
        +
      12. wm-exit.service
        [Unit]
@@ -2524,9 +2532,9 @@ EndSection
      7. -
    7. openbox
      +
    8. openbox
        -
      1. autostart
        +
      2. autostart
        # forward environment variables to an environment file and the systemd user session
@@ -2560,7 +2568,7 @@ systemctl --user isolate yavdr-desktop.target
        3. -
      3. rc.xml
        +
      4. rc.xml
        <?xml version="1.0" encoding="UTF-8"?>
@@ -3390,12 +3398,12 @@ systemctl --user isolate yavdr-desktop.target
        -
        -

        7.11 samba-install

        +
        +

        7.11 samba-install

        -
        -

        7.11.1 tasks

        +
        +

        7.11.1 tasks

        ---
@@ -3417,12 +3425,12 @@ systemctl --user isolate yavdr-desktop.target
        -
        -

        7.12 samba-config

        +
        +

        7.12 samba-config

        -
        -

        7.12.1 tasks

        +
        +

        7.12.1 tasks

        ---
@@ -3447,14 +3455,14 @@ systemctl --user isolate yavdr-desktop.target
        -
        -

        7.12.2 templates

        +
        +

        7.12.2 templates

          -
        1. smb.conf
          +
        2. smb.conf
            -
          1. global settings
            +
          2. global settings
            {{ ansible_managed_file | comment }}
@@ -3540,7 +3548,7 @@ systemctl --user isolate yavdr-desktop.target
            3. -
          3. media directories
            +
          4. media directories
            {% for name, path in media_dirs.iteritems() %}
@@ -3562,7 +3570,7 @@ systemctl --user isolate yavdr-desktop.target
            5. -
          5. include custom samba exports
            +
          6. include custom samba exports
            include = /etc/samba/smb.conf.custom
@@ -3575,15 +3583,15 @@ systemctl --user isolate yavdr-desktop.target
        -
        -

        7.13 STARTED autoinstall-drivers

        +
        +

        7.13 STARTED autoinstall-drivers

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

        -
        -

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

        +
        +

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

        Vendor-IDs: @@ -3594,14 +3602,14 @@ Vendor-IDs:

        -
        -

        7.13.2 TODO dddvb-dkms if only newer DD cards are detected

        +
        +

        7.13.2 TODO dddvb-dkms if only newer DD cards are detected

        -
        -

        7.13.3 TODO media-build-experimental (up to kernel 4.8) for „old“ cards like TT S2-6400 FF

        +
        +

        7.13.3 TODO media-build-experimental (up to kernel 4.8) for „old“ cards like TT S2-6400 FF

        -
        -

        7.13.4 TODO newly merged DD drivers

        +
        +

        7.13.4 TODO newly merged DD drivers

        from http://www.vdr-portal.de/board18-vdr-hardware/board102-dvb-karten/120817-treiber-der-cine-ctv6-ddbridge-ci-in-den-kernel-integrieren/ @@ -3610,15 +3618,15 @@ from -

        7.14 autoinstall-ubuntu-drivers

        +
        +

        7.14 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.14.1 tasks

        +
        +

        7.14.1 tasks

        ---
@@ -3641,15 +3649,15 @@ The tool ubuntu-drivers is used to install the matching driver version for nvidi
        -
        -

        7.15 autoinstall-satip

        +
        +

        7.15 autoinstall-satip

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

        -
        -

        7.15.1 tasks

        +
        +

        7.15.1 tasks

        ---
@@ -3665,6 +3673,7 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-sa
 - name: apt | install vdr-plugin-satip if a Sat>IP server has been detected
   apt:
     name: vdr-plugin-satip
+    state: present
   when: satip_devices
   notify: [ 'Restart VDR' ]
        @@ -3673,12 +3682,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

        ---
@@ -3694,12 +3703,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

        ---
@@ -3715,12 +3724,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

        ---
@@ -3736,12 +3745,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

        ---
@@ -3757,8 +3766,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

        ---
@@ -3773,12 +3782,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

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

        7.21.2 tasks

        +
        +

        7.21.2 tasks

        ---
@@ -3840,15 +3849,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

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

        -
        -

        7.22.1 tasks

        +
        +

        7.22.1 tasks

        ---
@@ -3865,12 +3874,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

        ---
@@ -3886,12 +3895,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 sasks

        +
        +

        7.24.1 tasks

        ---
@@ -3900,30 +3909,31 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
 - name: apt | install yavdr-hardware-irmp if connected
   apt:
     name: yavdr-hardware-irmp
+    state: present
   when: '"1209:4444" in usb'
          -
        1. TODO add other device ids if necessary
          2. +
        2. TODO add other device ids if necessary
        -
        -

        7.25 kodi

        +
        +

        7.25 kodi

        -
        -

        7.25.1 tasks

        +
        +

        7.25.1 tasks

          -
        1. Install KODI
          +
        2. Install KODI
            -
          • main.yml
            -
            +
          • main.yml
            +
            - import_tasks: install-kodi.yml tags=install,update,kodi:install
 - import_tasks: configure-kodi.yml tags=install,update,kodi:configure
@@ -3931,7 +3941,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
            • -
          • install-kodi.yml
            +
          • install-kodi.yml
            ---
@@ -3949,7 +3959,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
            • -
          • configure-kodi.yml
            +
          • configure-kodi.yml
            - name: create kodi.service for the user session
@@ -3998,12 +4008,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
        -

        7.25.2 templates

        +
        +

        7.25.2 templates

          -
        1. kodi.service
          +
        2. kodi.service

          This systemd unit for the user session starts (and stops) kodi. @@ -4028,15 +4038,15 @@ This systemd unit for the user session starts (and stops) kodi.

        -
        -

        7.25.3 files

        +
        +

        7.25.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. @@ -4106,14 +4116,14 @@ This file allows to map keys sent by remotes via eventlircd (which uses the name

        5. -
      5. keymaps
        +
      6. keymaps

        This file maps the keys defined in Lircmap.xml to actions within kodi.

          -
        1. remote.xml
          +
        2. remote.xml
          <!-- This file contains the mapping of keys (gamepad, remote, and keyboard) to actions within XBMC -->
@@ -4664,17 +4674,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

      -
    • install libdvd-pkg, allow programs to eject optical media
      -
      +
    • install libdvd-pkg, allow programs to eject optical media
      +
      ---
 # file: roles/dvd/tasks/main.yml
@@ -4714,8 +4724,8 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
    -
    -

    7.27 template-test

    +
    +

    7.27 template-test

    ---
@@ -4956,14 +4966,53 @@ EndSection
    -
    -

    7.28 grub-config

    +
    +

    7.28 wakeup

    -
    -

    7.28.1 default variables

    +
    +

    7.28.1 defaults

    +
    ---
+# file roles/wakeup/defaults/main.yml
+wakeup_method: "acpiwakeup"
+
    +
    +
    +
    +
    +

    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'
+
+  when: wakeup_method == "acpiwakeup"
+
    +
    +
    +
    +
    +
    +

    7.29 grub-config

    +
    +
    +
    +

    7.29.1 default variables

    +
    +
    system:
   shutdown: poweroff
 grub:
@@ -4973,9 +5022,9 @@ EndSection
    -
    -

    7.28.2 tasks

    -
    +
    +

    7.29.2 tasks

    +
    ---
 
@@ -4999,9 +5048,9 @@ EndSection
    -
    -

    7.28.3 templates

    -
    +
    +

    7.29.3 templates

    +
    #!/bin/sh
 exec tail -n +3 $0
@@ -5023,9 +5072,9 @@ menuentry "PowerOff" {
    -
    -

    7.28.4 handlers

    -
    +
    +

    7.29.4 handlers

    +
    ---
 
@@ -5042,15 +5091,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.
@@ -5217,8 +5266,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 = '''
@@ -5342,8 +5391,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)
      • @@ -5622,8 +5671,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
@@ -5688,7 +5737,7 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c

    Autor: Alexander Grothe <seahawk1986@gmx.de>

    -

    Created: 2017-11-20 Mo 09:21

    +

    Created: 2017-11-20 Mo 09:44

    Validate

    diff --git a/Manual.org b/Manual.org index 3961174..06aec92 100644 --- a/Manual.org +++ b/Manual.org @@ -189,6 +189,7 @@ The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation: - kodi - dvd # set up packages and a udev rule to allow kodi and other players # to play and eject optical media + - wakeup # set up wakeup methods for rtc etc. - grub-config # configure grub tags: - always @@ -216,6 +217,7 @@ For a headless server installation ~yavdr07-headless.yml~ is a good choice - nfs-server - grub-config - autoinstall-satip + - wakeup tags: - always handlers: @@ -303,7 +305,6 @@ extra_packages: - bpython3 - htop - tree - - vdr-addon-acpiwakeup - vim - w-scan #+END_SRC @@ -312,6 +313,7 @@ extra_packages: frontend: vdr #system: # shutdown: poweroff +wakeup_method: acpiwakeup grub: timeout: 0 boot_options: quiet nosplash @@ -3180,6 +3182,7 @@ If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip - name: apt | install vdr-plugin-satip if a Sat>IP server has been detected apt: name: vdr-plugin-satip + state: present when: satip_devices notify: [ 'Restart VDR' ] #+END_SRC @@ -3275,7 +3278,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll notify: [ 'Restart VDR' ] #+END_SRC ** autoinstall-hardware-irmp -*** sasks +*** tasks #+BEGIN_SRC yaml :tangle roles/autoinstall-hardware-irmp/tasks/main.yml :padline no --- # file roles/autoinstall-hardware-irmp/tasks/main.yml @@ -3283,6 +3286,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll - name: apt | install yavdr-hardware-irmp if connected apt: name: yavdr-hardware-irmp + state: present when: '"1209:4444" in usb' #+END_SRC @@ -3559,6 +3563,31 @@ system: mode: - "1280x720_60" #+END_SRC +** wakeup +*** defaults +#+BEGIN_SRC yaml :tangle roles/wakeup/defaults/main.yml :padline no +--- +# file roles/wakeup/defaults/main.yml +wakeup_method: "acpiwakeup" +#+END_SRC +*** tasks +#+BEGIN_SRC yaml :tangle roles/wakeup/tasks/main.yml :padline no +--- +# 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' + + when: wakeup_method == "acpiwakeup" +#+END_SRC ** grub-config *** default variables #+BEGIN_SRC yaml :tangle roles/grub-config/defaults/main.yml :mkdirp yes :padline no diff --git a/group_vars/all b/group_vars/all index 4074f8e..d6cafb1 100644 --- a/group_vars/all +++ b/group_vars/all @@ -50,12 +50,12 @@ extra_packages: - bpython3 - htop - tree - - vdr-addon-acpiwakeup - vim - w-scan frontend: vdr #system: # shutdown: poweroff +wakeup_method: acpiwakeup grub: timeout: 0 boot_options: quiet nosplash diff --git a/roles/autoinstall-hardware-irmp/tasks/main.yml b/roles/autoinstall-hardware-irmp/tasks/main.yml index cfb5a99..936d812 100644 --- a/roles/autoinstall-hardware-irmp/tasks/main.yml +++ b/roles/autoinstall-hardware-irmp/tasks/main.yml @@ -4,4 +4,5 @@ - name: apt | install yavdr-hardware-irmp if connected apt: name: yavdr-hardware-irmp + state: present when: '"1209:4444" in usb' diff --git a/roles/autoinstall-satip/tasks/main.yml b/roles/autoinstall-satip/tasks/main.yml index 4c75584..1017052 100644 --- a/roles/autoinstall-satip/tasks/main.yml +++ b/roles/autoinstall-satip/tasks/main.yml @@ -11,5 +11,6 @@ - name: apt | install vdr-plugin-satip if a Sat>IP server has been detected apt: name: vdr-plugin-satip + state: present when: satip_devices notify: [ 'Restart VDR' ] diff --git a/roles/wakeup/defaults/main.yml b/roles/wakeup/defaults/main.yml new file mode 100644 index 0000000..d84f7a9 --- /dev/null +++ b/roles/wakeup/defaults/main.yml @@ -0,0 +1,3 @@ +--- +# file roles/wakeup/defaults/main.yml +wakeup_method: "acpiwakeup" diff --git a/roles/wakeup/tasks/main.yml b/roles/wakeup/tasks/main.yml new file mode 100644 index 0000000..a5396c6 --- /dev/null +++ b/roles/wakeup/tasks/main.yml @@ -0,0 +1,15 @@ +--- +# 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' + + when: wakeup_method == "acpiwakeup" diff --git a/roles/yavdr-common/tasks/main.yml b/roles/yavdr-common/tasks/main.yml index e245cbf..415c351 100644 --- a/roles/yavdr-common/tasks/main.yml +++ b/roles/yavdr-common/tasks/main.yml @@ -7,6 +7,3 @@ - import_tasks: configure_system.yml - import_tasks: create_directories.yml tags: [install] - -- import_tasks: gather_facts.yml - tags: [install, autodetect] diff --git a/yavdr07-headless.yml b/yavdr07-headless.yml index b2ae784..6e92414 100644 --- a/yavdr07-headless.yml +++ b/yavdr07-headless.yml @@ -15,6 +15,7 @@ - nfs-server - grub-config - autoinstall-satip + - wakeup tags: - always handlers: diff --git a/yavdr07.yml b/yavdr07.yml index 6a9fa83..d1490c9 100644 --- a/yavdr07.yml +++ b/yavdr07.yml @@ -30,6 +30,7 @@ - kodi - dvd # set up packages and a udev rule to allow kodi and other players # to play and eject optical media + - wakeup # set up wakeup methods for rtc etc. - grub-config # configure grub tags: - always