diff --git a/Manual.html b/Manual.html index 4bd3d53..5397875 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,262 +240,262 @@ 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. @@ -528,24 +528,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. @@ -580,8 +580,8 @@ We use a callback to generate tags for all roles autmatically:

-
-

3.1 Install script for local usage

+
+

3.1 Install script for local usage

set -e
@@ -605,12 +605,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: @@ -662,8 +662,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 @@ -701,8 +701,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: @@ -716,12 +716,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

---
@@ -739,8 +739,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
@@ -766,8 +766,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
@@ -782,8 +782,8 @@ This playbook can either be used to run the installation on the localhost or any
 
-
-

6.4 NFS

+
+

6.4 NFS

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

6.5 Samba

+
+

6.5 Samba

samba:
@@ -803,8 +803,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
@@ -820,8 +820,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
@@ -836,20 +836,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
    ---
    @@ -870,19 +870,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
      ---
      @@ -912,15 +912,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. @@ -933,7 +933,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. @@ -950,7 +950,7 @@ You can set a list of package repositories which provide the necessary packages.

  3. -
  4. Drivers
    +
  5. 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. @@ -963,7 +963,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 @@ -977,7 +977,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. @@ -1010,15 +1010,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
      ---
      @@ -1035,7 +1035,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: @@ -1052,7 +1052,7 @@ This task prevents apt to automatically install all recommended dependencies for

    -
  • Set up package repositories
    +
  • Set up package repositories
    - name: add PPAs
    @@ -1072,7 +1072,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
    @@ -1084,15 +1084,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
      @@ -1114,7 +1114,7 @@ This task prevents apt to automatically install all recommended dependencies for
       
  • -
  • Install essential packages
    +
  • Install essential packages
    - name: apt | install basic packages
    @@ -1146,7 +1146,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
    @@ -1160,11 +1160,11 @@ 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
  • @@ -1172,8 +1172,8 @@ This task prevents apt to automatically install all recommended dependencies for
    -
    -

    7.3.3 templates

    +
    +

    7.3.3 templates

    {{ ansible_managed | comment('c') }}
    @@ -1184,7 +1184,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 @@ -1199,12 +1199,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
    @@ -1212,12 +1212,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
      @@ -1266,16 +1266,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
      ---
      @@ -1294,7 +1294,7 @@ Allow the vdr user to restart vdr.service and reboot the system
       
    3. -
    4. Add svdrp/svdrp-disc to /etc/services
      +
    5. Add svdrp/svdrp-disc to /etc/services
      - name: add svdrp and svdrp-disc to /etc/services
      @@ -1309,7 +1309,7 @@ Allow the vdr user to restart vdr.service and reboot the system
       
    6. -
    7. Set up the recording directory for the vdr user
      +
    8. Set up the recording directory for the vdr user
      - name: create vdr recdir
      @@ -1344,7 +1344,7 @@ Allow the vdr user to restart vdr.service and reboot the system
       
    9. -
    10. Install additional vdr plugins
      +
    11. Install additional vdr plugins

      The additional plugins to install can be set in the variable {{vdr_plugins}} in the group variables @@ -1362,7 +1362,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
    @@ -1393,7 +1393,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
    @@ -1414,8 +1414,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 @@ -1427,12 +1427,12 @@ Start after network-online.target

    -
    -

    7.5.3 files

    +
    +

    7.5.3 files

      -
    1. remote.conf
      +
    2. remote.conf
      LIRC.Up KEY_UP
      @@ -1567,7 +1567,7 @@ XKeySym.Next       XF86AudioNext
       
    3. -
    4. keymacros.conf
      +
    5. keymacros.conf
      # Remote control key macros for VDR
      @@ -1593,12 +1593,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
    @@ -1606,8 +1606,8 @@ User0     @osdteletext
     
    -
    -

    7.6.2 tasks

    +
    +

    7.6.2 tasks

    ---
    @@ -1677,17 +1677,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

    ---
    @@ -1716,12 +1716,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 }})
      @@ -1732,7 +1732,7 @@ User0     @osdteletext
       
    3. -
    4. avahi services
      +
    5. avahi services
      <?xml version="1.0" standalone='no'?>
      @@ -1754,15 +1754,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
      @@ -1770,8 +1770,8 @@ The role yavdr-remote sets up the foundation for using eventlircd,
       
      -
      -

      7.8.2 tasks

      +
      +

      7.8.2 tasks

      ---
      @@ -1844,12 +1844,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' %}
        @@ -1860,7 +1860,7 @@ The role yavdr-remote sets up the foundation for using eventlircd,
         
      3. -
      4. Systemd Drop-in to start lircd2uinput with lircd
        +
      5. Systemd Drop-in to start lircd2uinput with lircd
        [Service]
        @@ -1870,7 +1870,7 @@ The role yavdr-remote sets up the foundation for using eventlircd,
         
      6. -
      7. create /etc/rc_maps.cfg
        +
      8. create /etc/rc_maps.cfg
        {{ ansible_managed | comment }}
        @@ -2062,19 +2062,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

      ---
      @@ -2097,8 +2097,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
      @@ -2121,12 +2121,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. @@ -2155,8 +2155,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
      @@ -2179,12 +2179,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
        ---
        @@ -2197,7 +2197,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
         
      3. -
      4. setup-xorg.yml
        +
      5. setup-xorg.yml
        ---
        @@ -2318,7 +2318,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
         
      6. -
      7. detect-xorg.yml
        +
      8. detect-xorg.yml
        ---
        @@ -2478,7 +2478,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
         
      9. -
      10. intel.yml
        +
      11. 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. @@ -2525,12 +2525,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' %} 
        @@ -2540,11 +2540,11 @@ Please note that rescanning the connected displays works only after removing the
         
      3. -
      4. xorg
        +
      5. xorg
          -
        1. x-verbose@.service
          +
        2. x-verbose@.service
          # file: roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2
          @@ -2560,7 +2560,7 @@ Please note that rescanning the connected displays works only after removing the
           
        3. -
        4. Drop-in snippet for x@.service
          +
        5. Drop-in snippet for x@.service
          [Unit]
          @@ -2586,7 +2586,7 @@ Please note that rescanning the connected displays works only after removing the
           
        6. -
        7. Drop-in snippet for vdr.service
          +
        8. Drop-in snippet for vdr.service
          {{ ansible_managed | comment }}
          @@ -2598,7 +2598,7 @@ Please note that rescanning the connected displays works only after removing the
           
        9. -
        10. xorg.conf snippets
          +
        11. xorg.conf snippets
          {{ ansible_managed | comment }}
          @@ -2612,7 +2612,7 @@ EndSection
           
        12. -
        13. xorg.conf
          +
        14. xorg.conf
          Section "Device"
          @@ -2938,7 +2938,7 @@ EndSection
           
      6. -
      7. vdr
        +
      8. vdr

        Set environment variables for system locale and user session on startup @@ -2954,12 +2954,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
        @@ -2985,16 +2985,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
          ---
          @@ -3161,16 +3161,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
            @@ -3193,7 +3193,7 @@ XTerm.vt100.font: 7x13
             
          3. -
          4. .xinitrc
            +
          5. .xinitrc
            #!/bin/bash
            @@ -3205,11 +3205,11 @@ XTerm.vt100.font: 7x13
             
        3. -
        4. openbox
          +
        5. openbox
            -
          1. autostart
            +
          2. autostart
            # forward environment variables to an environment file and the systemd user session
            @@ -3245,7 +3245,7 @@ systemctl --user isolate yavdr-desktop.target
             
          3. -
          4. rc.xml
            +
          5. rc.xml
            <?xml version="1.0" encoding="UTF-8"?>
            @@ -4071,7 +4071,7 @@ systemctl --user isolate yavdr-desktop.target
             
          6. -
          7. rc2.xml
            +
          8. rc2.xml
            <?xml version="1.0" encoding="UTF-8"?>
            @@ -4900,11 +4900,11 @@ systemctl --user isolate yavdr-desktop.target
             
        6. -
        7. Systemd User Session
          +
        8. Systemd User Session
            -
          1. yavdr-desktop.target
            +
          2. yavdr-desktop.target
            [Unit]
            @@ -4917,7 +4917,7 @@ systemctl --user isolate yavdr-desktop.target
             
          3. -
          4. detect-second-display
            +
          5. detect-second-display
            #!/bin/bash
            @@ -4946,7 +4946,7 @@ systemctl --user isolate yavdr-desktop.target
             
          6. -
          7. switch-displays
            +
          8. switch-displays

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

      3. -
      4. openbox-second.service
        +
      5. openbox-second.service
        [Unit]
        @@ -4987,7 +4987,7 @@ frontend-dbus-send start
         
      6. -
      7. osd2web.service
        +
      8. osd2web.service
        [Unit]
        @@ -5010,7 +5010,7 @@ frontend-dbus-send start
         
      9. -
      10. tmux.service
        +
      11. tmux.service
        [Unit]
        @@ -5029,7 +5029,7 @@ frontend-dbus-send start
         
      12. -
      13. wm-exit.service
        +
      14. wm-exit.service
        [Unit]
        @@ -5048,7 +5048,7 @@ frontend-dbus-send start
         
    6. -
    7. irexec
      +
    8. irexec

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

    -
    -

    7.12 samba-install

    +
    +

    7.12 samba-install

    -
    -

    7.12.1 tasks

    +
    +

    7.12.1 tasks

    ---
    @@ -5109,12 +5109,12 @@ end
     
    -
    -

    7.13 samba-config

    +
    +

    7.13 samba-config

    -
    -

    7.13.1 tasks

    +
    +

    7.13.1 tasks

    ---
    @@ -5139,16 +5139,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 }}
        @@ -5234,7 +5234,7 @@ end
         
      3. -
      4. media directories
        +
      5. media directories
        {% for name, path in media_dirs.iteritems() %}
        @@ -5256,7 +5256,7 @@ end
         
      6. -
      7. include custom samba exports
        +
      8. include custom samba exports
        include = /etc/samba/smb.conf.custom
        @@ -5269,15 +5269,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: @@ -5288,7 +5288,7 @@ Vendor-IDs:

      -
    1. planned packages
      +
    2. planned packages
      • yavdr-hardware-sundtek
      • @@ -5299,8 +5299,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? @@ -5308,15 +5308,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

    ---
    @@ -5339,8 +5339,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 @@ -5391,12 +5391,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

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

    7.17.2 tasks

    +
    +

    7.17.2 tasks

    ---
    @@ -5451,8 +5451,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 }}
    @@ -5481,12 +5481,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

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

    7.18.2 tasks

    +
    +

    7.18.2 tasks

    ---
    @@ -5540,8 +5540,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 }}
    @@ -5569,15 +5569,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

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

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

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

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

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

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

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

    7.25.2 tasks

    +
    +

    7.25.2 tasks

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

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

    7.26.2 defaults

    +
    +

    7.26.2 defaults

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

    7.26.3 tasks

    +
    +

    7.26.3 tasks

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

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

    7.27.2 tasks

    +
    +

    7.27.2 tasks

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

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

    7.28.2 tasks

    +
    +

    7.28.2 tasks

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

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

    7.29.2 tasks

    +
    +

    7.29.2 tasks

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

    7.30 kodi

    +
    +

    7.30 kodi

    -
    -

    7.30.1 tasks

    +
    +

    7.30.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
        @@ -5965,7 +5965,7 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
         
      • -
      • install-kodi.yml
        +
      • install-kodi.yml
        ---
        @@ -5997,7 +5997,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
        @@ -6046,12 +6046,12 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
         
    -
    -

    7.30.2 templates

    +
    +

    7.30.2 templates

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

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

    -
    -

    7.30.3 files

    +
    +

    7.30.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. @@ -6155,14 +6155,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"?>
      @@ -6714,17 +6714,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
       
  • -
    -

    7.31 dvd

    +
    +

    7.31 dvd

    -
    -

    7.31.1 tasks

    +
    +

    7.31.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
      @@ -6765,17 +6765,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
       
    -
    -

    7.32 install-sundtek

    +
    +

    7.32 install-sundtek

    -
    -

    7.32.1 variables

    +
    +

    7.32.1 variables

    -
    -

    7.32.2 tasks

    +
    +

    7.32.2 tasks

    ---
    @@ -6824,12 +6824,12 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
     
    -
    -

    7.32.3 templates

    +
    +

    7.32.3 templates

      -
    1. /etc/sundtek.conf
      +
    2. /etc/sundtek.conf
      # ----- GLOBAL SECTION -----
      @@ -6937,8 +6937,8 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
       
    -
    -

    7.33 template-test

    +
    +

    7.33 template-test

    ---
    @@ -7179,12 +7179,12 @@ EndSection
     
    -
    -

    7.34 wakeup

    +
    +

    7.34 wakeup

    -
    -

    7.34.1 defaults

    +
    +

    7.34.1 defaults

    ---
    @@ -7194,8 +7194,8 @@ EndSection
     
    -
    -

    7.34.2 tasks

    +
    +

    7.34.2 tasks

    ---
    @@ -7216,8 +7216,8 @@ EndSection
     
    -
    -

    7.34.3 templates

    +
    +

    7.34.3 templates

    {{ ansible_managed | comment }}
    @@ -7243,12 +7243,12 @@ ACPI_START_AHEAD=5
     
    -
    -

    7.35 grub-config

    +
    +

    7.35 grub-config

    -
    -

    7.35.1 default variables

    +
    +

    7.35.1 default variables

    system:
    @@ -7260,8 +7260,8 @@ ACPI_START_AHEAD=5
     
    -
    -

    7.35.2 tasks

    +
    +

    7.35.2 tasks

    ---
    @@ -7286,8 +7286,8 @@ ACPI_START_AHEAD=5
     
    -
    -

    7.35.3 templates

    +
    +

    7.35.3 templates

    #!/bin/sh
    @@ -7310,8 +7310,8 @@ menuentry "PowerOff" 
    -

    7.35.4 handlers

    +
    +

    7.35.4 handlers

    ---
    @@ -7334,15 +7334,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.
    @@ -7520,8 +7520,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

    @@ -7597,8 +7597,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 = '''
    @@ -7722,15 +7722,16 @@ 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)
    -
    from __future__ import print_function
    +
    #!/usr/bin/env python2
    +from __future__ import print_function
     import ast
     import binascii
     import csv
    @@ -8010,8 +8011,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
    @@ -8104,7 +8105,7 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c
     

    Autor: Alexander Grothe <seahawk1986@gmx.de>

    -

    Created: 2018-09-30 So 10:55

    +

    Created: 2018-10-01 Mo 11:05

    Validate

    diff --git a/Manual.org b/Manual.org index 575a123..139034c 100644 --- a/Manual.org +++ b/Manual.org @@ -6610,283 +6610,7 @@ if __name__ == '__main__': :END: - [ ] support multiple screens (-d :0.0 .. :0.n) -#+BEGIN_SRC python :tangle library/xrandr_facts.py :shebang #!/usr/bin/env python2 -from __future__ import print_function -import ast -import binascii -import csv -import re -import subprocess -from collections import namedtuple - -from ansible.module_utils.basic import * - -DOCUMENTATION = ''' ---- -module: xrandr_facts -short_description: "gather facts about connected monitors and available modelines" -description: - - This module needs a running x-server on a given display in order to successfully call xrandr. - Returns the dictionary "xrandr", wich contains all screens with output states, connected displays, - EDID info and their modes and a recommendation for the best fitting tv mode. -options: - display: - required: False - default: ":0" - description: - - the DISPLAY variable to use when calling xrandr - preferred_outputs: - required: False - default: ["HDMI", "DP", "DVI", "VGA", "TV"] - description: - - ranking of the preferred display connectors - preferred_refreshrates: - required: False - default: ["50", "60", "75", "30", "25"] - description: - - ranking of the preferred display refreshrate - preferred_resolutions: - required: False - default: ["7680x4320", "3840x2160", "1920x1080", "1280x720", "720x576"] - description: - - ranking of the preferred display resolutions - write_edids: - required: False - default: True - description: - - write edid data to /etc/X11/edid.{connector}.bin -''' -EXAMPLES = ''' -- name: "collect facts for connected displays" - action: xserver_facts - display: ":0" - -- debug: - var: xrandr - -- debug: - var: xorg -''' - -ARG_SPECS = { - 'display': dict(default=":0", type='str', required=False), - 'preferred_outputs': dict( - default=["HDMI", "DP", "DVI", "VGA", "TV"], type='list', required=False), - 'preferred_refreshrates': dict( - default=[50, 60, 75, 30, 25], type='list', required=False), - 'preferred_resolutions': dict( - default=[ - "7680x4320", "3840x2160", "1920x1080", "1280x720", "720x576"], - type='list', required=False), - 'write_edids': dict(default=True, type='bool', required=False), - } - -SCREEN_REGEX = re.compile("^(?PScreen\s\d+:)(?:.*)") -CONNECTOR_REGEX = re.compile( - "^(?P.*-\d+)\s(?Pconnected|disconnected)\s(?Pprimary)?") -MODE_REGEX = re.compile("^\s+(?P\d{3,}x\d{3,}).*") - -Mode = namedtuple('Mode', ['connection', 'resolution', 'refreshrate']) - -def check_for_screen(line): - """check line for screen information""" - match = re.match(SCREEN_REGEX, line) - if match: - return match.groupdict()['screen'] - -def check_for_connection(line): - """check line for connection name and state""" - match = re.match(CONNECTOR_REGEX, line) - connector = None - is_connected = False - if match: - match = match.groupdict() - connector = match['connector'] - is_connected = True if match['connection_state'] == 'connected' else False - return connector, is_connected - -def get_indentation(line): - """return the number of leading whitespace characters""" - return len(line) - len(line.lstrip()) - -def sort_mode(mode): - """rate modes by several criteria""" - connection_score = 0 - rrate_score = 0 - resolution_score = 0 - preferred_rrates = module.params['preferred_refreshrates'] - # [50, 60] - preferred_resolutions = module.params['preferred_resolutions'] - # ["7680x4320", "3840x2160", "1920x1080", "1280x720", "720x576"] - preferred_outputs = module.params['preferred_outputs'] - # ["HDMI", "DP", "DVI", "VGA"] - if mode.refreshrate in preferred_rrates: - rrate_score = len(preferred_rrates) - preferred_rrates.index(mode.refreshrate) - if mode.resolution in preferred_resolutions: - resolution_score = len(preferred_resolutions) - preferred_resolutions.index(mode.resolution) - x_resolution, y_resolution = (int(n) for n in mode.resolution.split('x')) - connection = mode.connection.split('-')[0] - if connection in preferred_outputs: - connection_score = len(preferred_outputs) - preferred_outputs.index(connection) - return (rrate_score, resolution_score, x_resolution, y_resolution, connection_score) - -def parse_xrandr_verbose(iterator): - """parse the output of xrandr --verbose using an iterator delivering single lines""" - xorg = {} - is_connected = False - for line in iterator: - if line.startswith('Screen'): - screen = check_for_screen(line) - xorg[screen] = {} - elif 'connected' in line: - connector, is_connected = check_for_connection(line) - xorg[screen][connector] = { - 'is_connected': is_connected, - 'EDID': '', - 'modes': {}, - 'preferred': '', - 'current': '', - 'auto': '', - } - elif is_connected and 'EDID:' in line: - edid_str = "" - outer_indentation = get_indentation(line) - while True: - line = next(iterator) - if get_indentation(line) > outer_indentation: - edid_str += line.strip() - else: - break - xorg[screen][connector]['EDID'] = edid_str - elif is_connected and "MHz" in line and not "Interlace" in line: - match = re.match(MODE_REGEX, line) - if match: - match = match.groupdict() - preferred = bool("+preferred" in line) - current = bool("*current" in line) - - while True: - line = next(iterator) - if line.strip().startswith('v:'): - refresh_rate = ast.literal_eval(line.split()[-1][:-2]) - rrate = int(round(refresh_rate)) - if xorg[screen][connector]['modes'].get(match['resolution']) is None: - xorg[screen][connector]['modes'][match['resolution']] = [] - if rrate not in xorg[screen][connector]['modes'][match['resolution']]: - xorg[screen][connector]['modes'][match['resolution']].append(rrate) - if preferred: - xorg[screen][connector]['preferred'] = "{}_{}".format( - match['resolution'], rrate) - if current: - xorg[screen][connector]['current'] = "{}_{}".format( - match['resolution'], rrate) - break - return xorg - -def parse_edid_data(edid): - vendor = "Unknown" - model = "Unknown" - try: - data = subprocess.check_output("parse-edid < {}".format(edid), - shell=True, universal_newlines=True) - except subprocess.CalledProcessError: - pass - else: - for line in data.splitlines(): - if "VendorName" in line: - vendor = line.strip().split('"')[1] - if "ModelName" in line: - model = line.strip().split('"')[1] - return vendor, model - -def collect_nvidia_data(): - BusID_RE = re.compile(( - '(?P[0-9a-fA-F]+)' - ':' - '(?P[0-9a-fA-F]+)' - ':' - '(?P[0-9a-fA-F]+)' - '\.' - '(?P[0-9a-fA-F]+)' - )) - try: - data = subprocess.check_output(["nvidia-smi", "--query-gpu=name,pci.bus_id", "--format=csv", "-i0"], - universal_newlines=True) - except subprocess.CalledProcessError: - pass - except OSError: - # nvidia-smi is not installed - pass - else: - for row in csv.DictReader(data.splitlines(), delimiter=',', skipinitialspace=True): - name = row['name'] - bus_id = row['pci.bus_id'] - # pci.bus_id structure as reported by nvidia-smi: "domain:bus:device.function", in hex. - match = BusID_RE.search(bus_id) - if match: - domain, bus, device, function = (int(n, 16) for n in match.groups()) - bus_id = "PCI:{:d}@{:d}:{:d}:{:d}".format(bus, domain, device, function) - return name, bus_id - raise ValueError - - -def output_data(data, write_edids=True): - result = {} - if data: - modes = [] - for _, screen_data in data.items(): - for connector, connection_data in screen_data.items(): - if connection_data.get('EDID') and write_edids: - with open('/etc/X11/edid.{}.bin'.format(connector), 'wb') as edid: - edid.write(binascii.a2b_hex(connection_data['EDID'])) - for resolution, refreshrates in connection_data['modes'].items(): - for refreshrate in refreshrates: - modes.append(Mode(connector, resolution, refreshrate)) - if modes: - try: - gpu_name, bus_id = collect_nvidia_data() - except ValueError: - gpu_name = None - bus_id = None - - def create_entry(my_dict, name, connector, resolution, refreshrate, vendor, model): - my_dict[name] = { - 'connector': connector, - 'resolution': resolution, - 'refreshrate': refreshrate, - 'edid': '/etc/X11/edid.{}.bin'.format(connector), - 'mode': "{}_{}".format(resolution, refreshrate), - 'vendor': vendor, - 'model': model, - } - if gpu_name and bus_id: - result[name]['gpu_name'] = gpu_name - result[name]['bus_id'] = bus_id - - connector_0, resolution_0, refreshrate_0 = max(modes, key=sort_mode)[:3] - vendor_0, model_0 = parse_edid_data('/etc/X11/edid.{}.bin'.format(connector_0)) - create_entry(result, 'primary', connector_0, resolution_0, refreshrate_0, vendor_0, model_0) - - # check if additional monitors exist - other_modes = [mode for mode in modes if mode[0] != connector_0] - if other_modes: - connector_1, resolution_1, refreshrate_1 = max(other_modes, key=sort_mode)[:3] - vendor_1, model_1 = parse_edid_data('/etc/X11/edid.{}.bin'.format(connector_1)) - create_entry(result, 'secondary', connector_1, resolution_1, refreshrate_1, vendor_1, model_1) - - #print(json.dumps(data, sort_keys=True, indent=4)) - module.exit_json(changed=True if write_edids else False, ansible_facts={'xrandr': data, 'xorg': result}) - -if __name__ == '__main__': - module = AnsibleModule(argument_spec=ARG_SPECS, supports_check_mode=False,) - try: - d = subprocess.check_output(['xrandr', '-d', module.params['display'], '--verbose'], universal_newlines=True).splitlines() - except subprocess.CalledProcessError: - xorg_data = {} - else: - xorg_data = parse_xrandr_verbose(iter(d)) - output_data(xorg_data, module.params['write_edids']) -#+END_SRC +#+INCLUDE: "library/xrandr_facts.py" src python * Handlers :PROPERTIES: :ID: e90af299-d84f-4924-803f-5644509c0a2f