From 252cade88588ed1e7e13aebf93ebf49e829bc836 Mon Sep 17 00:00:00 2001 From: Alexander Grothe Date: Tue, 16 Jan 2018 13:07:01 +0100 Subject: [PATCH] use ansible_managed instead of own variable ansible_managed_file --- Manual.html | 925 +++++++++--------- Manual.org | 29 +- ansible.cfg | 2 + group_vars/all | 2 - .../templates/lirc_options.conf.j2 | 2 +- .../templates/lirc_options.conf.j2 | 2 +- roles/samba-config/templates/smb.conf.j2 | 2 +- .../templates/vdr-addon-acpiwakeup.conf.j2 | 2 +- .../yavdr-common/templates/90-norecommends.j2 | 2 +- roles/yavdr-xorg/templates/.xinitrc.j2 | 2 +- roles/yavdr-xorg/templates/vdr-xorg.conf | 2 +- roles/yavdr-xorg/templates/xorg.conf.j2 | 2 +- 12 files changed, 480 insertions(+), 494 deletions(-) diff --git a/Manual.html b/Manual.html index 3810f35..a86183d 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,250 +240,249 @@ 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. @@ -516,22 +515,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. @@ -559,12 +558,14 @@ We use a callback to generate tags for all roles autmatically: 

[defaults]
 callback_plugins = plugins/callbacks
 callback_whitelist = auto_tags
+ansible_managed = *** ANSIBLE MANAGED FILE ***
+  template: {file}
-
-

3.1 Install script for local usage

+
+

3.1 Install script for local usage

if (( $EUID != 0 )); then
@@ -587,12 +588,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: @@ -642,8 +643,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 @@ -676,8 +677,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: @@ -691,28 +692,18 @@ 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 PPAs

---
 # file: group_vars/all
 
-# this is the standard text to put in templates
-ansible_managed_file: "*** YAVDR: ANSIBLE MANAGED FILE ***\norigin: {file}"
-
-
-
-
-
-

6.2 PPAs

-
-
-
branch: experimental
+branch: experimental
 ppa_owner: 'ppa:yavdr'
 # add the following PPAs
 repositories:
@@ -724,9 +715,9 @@ 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.2 VDR user, directories, special configuration and plugins

+
# properties of the user vdr and vdr-related options
 vdr:
@@ -751,9 +742,9 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.4 Media directories

-
+
+

6.3 Media directories

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

6.5 NFS

-
+
+

6.4 NFS

+
nfs:
   insecure: false  # set to true for OS X clients or if you plan to use libnfs as unprivileged user (e.g. KODI)
@@ -777,9 +768,9 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.6 Samba

-
+
+

6.5 Samba

+
samba:
   workgroup: YAVDR
@@ -788,9 +779,9 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.7 Additional packages

-
+
+

6.6 Additional packages

+
# additional packages you want to install
 extra_packages:
@@ -805,9 +796,9 @@ This playbook can either be used to run the installation on the localhost or any
-
-

6.8 System pre-configuration

-
+
+

6.7 System pre-configuration

+
frontend: vdr
 #system:
@@ -821,20 +812,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
    ---
@@ -854,19 +845,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
      ---
@@ -896,15 +887,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. @@ -917,7 +908,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. @@ -934,7 +925,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. @@ -947,7 +938,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 @@ -961,7 +952,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. @@ -994,15 +985,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
      ---
@@ -1018,7 +1009,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: @@ -1035,7 +1026,7 @@ This task prevents apt to automatically install all recommended dependencies for

    -
  • Set up package repositories
    +
  • Set up package repositories
    - name: add PPAs
@@ -1055,7 +1046,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
@@ -1067,10 +1058,10 @@ 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
      -
    1. SOMEDAY move from lineinfile to template
      +
    2. SOMEDAY move from lineinfile to template
      - name: disable release-upgrade notifications
@@ -1092,7 +1083,7 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • Install essential packages
    +
  • Install essential packages
    - name: apt | install basic packages
@@ -1124,7 +1115,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
@@ -1138,16 +1129,16 @@ This task prevents apt to automatically install all recommended dependencies for
    • -
  • create directories
    • +
  • create directories
    • -
    -

    7.3.3 templates

    +
    +

    7.3.3 templates

    -
    {{ ansible_managed_file | comment('c') }}
+
    {{ ansible_managed | comment('c') }}
 // Recommends are as of now still abused in many packages
 APT::Install-Recommends "0";
 APT::Install-Suggests "0";
@@ -1156,12 +1147,12 @@ 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 variables

    +
    +

    7.4.1 variables

    first_run: False
@@ -1169,12 +1160,12 @@ APT::Install-Suggests "0";
    -
    -

    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
@@ -1214,16 +1205,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
      ---
@@ -1242,7 +1233,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
@@ -1257,7 +1248,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
@@ -1292,7 +1283,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 @@ -1310,7 +1301,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
@@ -1343,15 +1334,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
@@ -1486,7 +1477,7 @@ XKeySym.Next       XF86AudioNext
      3. -
    3. keymacros.conf
      +
    4. keymacros.conf
      # Remote control key macros for VDR
@@ -1512,12 +1503,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
@@ -1525,8 +1516,8 @@ User0     @osdteletext
    -
    -

    7.6.2 tasks

    +
    +

    7.6.2 tasks

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

    ---
@@ -1633,12 +1624,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 }})
@@ -1649,7 +1640,7 @@ User0     @osdteletext
      3. -
    3. avahi services
      +
    4. avahi services
      <?xml version="1.0" standalone='no'?>
@@ -1670,12 +1661,12 @@ User0     @osdteletext
    -
    -

    7.8 STARTED yavdr-remote

    +
    +

    7.8 STARTED yavdr-remote

    -
    -

    7.8.1 default variables

    +
    +

    7.8.1 default variables

    lircd0_socket: /var/run/lirc/lircd0
@@ -1683,8 +1674,8 @@ User0     @osdteletext
    -
    -

    7.8.2 tasks

    +
    +

    7.8.2 tasks

    ---
@@ -1748,12 +1739,12 @@ User0     @osdteletext
    -
    -

    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' %}
@@ -1764,7 +1755,7 @@ User0     @osdteletext
      3. -
    3. Systemd Drop-in to start lircd2uinput with lircd
      +
    4. Systemd Drop-in to start lircd2uinput with lircd
      [Service]
@@ -1774,7 +1765,7 @@ User0     @osdteletext
      5. -
    5. create /etc/rc_maps.cfg
      +
    6. create /etc/rc_maps.cfg
      #
@@ -1965,17 +1956,17 @@ 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

    ---
@@ -1998,8 +1989,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
@@ -2021,12 +2012,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. @@ -2055,8 +2046,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
@@ -2064,12 +2055,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
      ---
@@ -2084,7 +2075,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
      3. -
    3. setup-xorg.yml
      +
    4. setup-xorg.yml
      ---
@@ -2189,7 +2180,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
      5. -
    5. detect-xorg.yml
      +
    6. detect-xorg.yml
      ---
@@ -2320,7 +2311,7 @@ In order to achive a clean shutdown of the session, x@t7.service is
      7. -
    7. desktop-session.yml
      +
    8. desktop-session.yml
      ---
@@ -2439,14 +2430,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
@@ -2462,7 +2453,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]
@@ -2483,10 +2474,10 @@ 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
        -
        {{ ansible_managed_file | comment }}
+
        {{ ansible_managed | comment }}
 [Unit]
 After=x@vt7.service
 Wants=x@vt7.service
@@ -2495,17 +2486,17 @@ In order to achive a clean shutdown of the session, x@t7.service is
        7. -
      7. .xinitrc
        +
      8. .xinitrc
        #!/bin/bash
-{{ ansible_managed_file | comment }}
+{{ ansible_managed | comment }}
 exec openbox-session
        9. -
      9. xorg.conf
        +
      10. xorg.conf
        Section "Device"
@@ -2531,7 +2522,7 @@ EndSection
        -
        {{ ansible_managed_file | comment }}
+
        {{ ansible_managed | comment }}
 
 Section "ServerLayout"
     Identifier     "Layout0"
@@ -2637,7 +2628,7 @@ EndSection
        -
        {{ ansible_managed_file | comment }}
+
        {{ ansible_managed | comment }}
 
 Section "ServerLayout"
     Identifier     "Layout0"
@@ -2834,7 +2825,7 @@ EndSection
        11. -
      11. .Xresources
        +
      12. .Xresources
        xterm*background: Black
@@ -2859,7 +2850,7 @@ XTerm.vt100.font: 7x13
      3. -
    3. vdr
      +
    4. vdr
      [Service]
@@ -2875,9 +2866,9 @@ XTerm.vt100.font: 7x13
      5. -
    5. Systemd User Session
      +
    6. Systemd User Session
        -
      1. yavdr-desktop.target
        +
      2. yavdr-desktop.target
        [Unit]
@@ -2891,7 +2882,7 @@ XTerm.vt100.font: 7x13
        3. -
      3. detect-second-display
        +
      4. detect-second-display
        [Unit]
@@ -2907,7 +2898,7 @@ XTerm.vt100.font: 7x13
        5. -
      5. openbox-second.service
        +
      6. openbox-second.service
        [Unit]
@@ -2929,7 +2920,7 @@ XTerm.vt100.font: 7x13
        7. -
      7. osd2web.service
        +
      8. osd2web.service
        [Unit]
@@ -2950,7 +2941,7 @@ XTerm.vt100.font: 7x13
        9. -
      9. tmux.service
        +
      10. tmux.service
        [Unit]
@@ -2969,7 +2960,7 @@ XTerm.vt100.font: 7x13
        11. -
      11. wm-exit.service
        +
      12. wm-exit.service
        [Unit]
@@ -2989,7 +2980,7 @@ XTerm.vt100.font: 7x13
      7. -
    7. irexec
      +
    8. irexec

      irexec.service starts irexec for the user session @@ -3019,9 +3010,9 @@ end

    • -
  • openbox
    +
  • openbox
      -
    1. autostart
      +
    2. autostart
      # forward environment variables to an environment file and the systemd user session
@@ -3057,7 +3048,7 @@ systemctl --user isolate yavdr-desktop.target
      3. -
    3. rc.xml
      +
    4. rc.xml
      <?xml version="1.0" encoding="UTF-8"?>
@@ -3877,12 +3868,12 @@ systemctl --user isolate yavdr-desktop.target
      -
      -

      7.11 samba-install

      +
      +

      7.11 samba-install

      -
      -

      7.11.1 tasks

      +
      +

      7.11.1 tasks

      ---
@@ -3904,12 +3895,12 @@ systemctl --user isolate yavdr-desktop.target
      -
      -

      7.12 samba-config

      +
      +

      7.12 samba-config

      -
      -

      7.12.1 tasks

      +
      +

      7.12.1 tasks

      ---
@@ -3934,17 +3925,17 @@ 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 }}
+
          {{ ansible_managed | comment }}
 
 #======================= Global Settings =======================
 
@@ -4027,7 +4018,7 @@ systemctl --user isolate yavdr-desktop.target
          3. -
        3. media directories
          +
        4. media directories
          {% for name, path in media_dirs.iteritems() %}
@@ -4049,7 +4040,7 @@ systemctl --user isolate yavdr-desktop.target
          5. -
        5. include custom samba exports
          +
        6. include custom samba exports
          include = /etc/samba/smb.conf.custom
@@ -4062,15 +4053,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: @@ -4081,14 +4072,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/ @@ -4097,15 +4088,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

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

      7.15 autoinstall-virtualbox-guest

      +
      +

      7.15 autoinstall-virtualbox-guest

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

      -
      -

      7.16 autoinstall-atric-usb

      +
      +

      7.16 autoinstall-atric-usb

      -
      -

      7.16.1 dependencies

      +
      +

      7.16.1 dependencies

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

      7.16.2 tasks

      +
      +

      7.16.2 tasks

      ---
@@ -4222,11 +4213,11 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
      -
      -

      7.16.3 templates

      +
      +

      7.16.3 templates

      -
      {{ ansible_managed_file | comment }}
+
      {{ ansible_managed | comment }}
 
 [lircd]
 nodaemon        = False
@@ -4252,12 +4243,12 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
      -
      -

      7.17 autoinstall-yausbir

      +
      +

      7.17 autoinstall-yausbir

      -
      -

      7.17.1 dependencies

      +
      +

      7.17.1 dependencies

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

      7.17.2 tasks

      +
      +

      7.17.2 tasks

      ---
@@ -4312,11 +4303,11 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
      -
      -

      7.17.3 templates

      +
      +

      7.17.3 templates

      -
      {{ ansible_managed_file | comment }}
+
      {{ ansible_managed | comment }}
 
 [lircd]
 nodaemon        = False
@@ -4341,15 +4332,15 @@ This role installs the guest additions for virtualbox guests on Ubuntu 16.04
      -
      -

      7.18 autoinstall-satip

      +
      +

      7.18 autoinstall-satip

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

      -
      -

      7.18.1 tasks

      +
      +

      7.18.1 tasks

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

      7.19 autoinstall-targavfd

      +
      +

      7.19 autoinstall-targavfd

      -
      -

      7.19.1 tasks

      +
      +

      7.19.1 tasks

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

      7.20 autoinstall-imonlcd

      +
      +

      7.20 autoinstall-imonlcd

      -
      -

      7.20.1 tasks

      +
      +

      7.20.1 tasks

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

      7.21 autoinstall-libcecdaemon

      +
      +

      7.21 autoinstall-libcecdaemon

      -
      -

      7.21.1 tasks

      +
      +

      7.21.1 tasks

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

      7.22 autoinstall-pvr350

      +
      +

      7.22 autoinstall-pvr350

      -
      -

      7.22.1 tasks

      +
      +

      7.22.1 tasks

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

      7.23 autoinstall-hauppauge-pvr

      +
      +

      7.23 autoinstall-hauppauge-pvr

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

      7.24 autoinstall-firmware

      +
      +

      7.24 autoinstall-firmware

      -
      -

      7.24.1 dependencies

      +
      +

      7.24.1 dependencies

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

      7.24.2 tasks

      +
      +

      7.24.2 tasks

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

      7.25 autoinstall-dvbsky-firmware

      +
      +

      7.25 autoinstall-dvbsky-firmware

      -
      -

      7.25.1 dependencies

      +
      +

      7.25.1 dependencies

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

      7.25.2 defaults

      +
      +

      7.25.2 defaults

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

      7.25.3 tasks

      +
      +

      7.25.3 tasks

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

      7.26 TODO autoinstall-dvbhddevice

      +
      +

      7.26 TODO autoinstall-dvbhddevice

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

      -
      -

      7.26.1 dependencies

      +
      +

      7.26.1 dependencies

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

      7.26.2 tasks

      +
      +

      7.26.2 tasks

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

      7.27 autoinstall-dvbsddevice

      +
      +

      7.27 autoinstall-dvbsddevice

      -
      -

      7.27.1 dependencies

      +
      +

      7.27.1 dependencies

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

      7.27.2 tasks

      +
      +

      7.27.2 tasks

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

      7.28 autoinstall-hardware-irmp

      +
      +

      7.28 autoinstall-hardware-irmp

      -
      -

      7.28.1 dependencies

      +
      +

      7.28.1 dependencies

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

      7.28.2 tasks

      +
      +

      7.28.2 tasks

      ---
@@ -4699,24 +4690,24 @@ Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware soll
        -
      1. TODO add other device ids if necessary
        2. +
      2. TODO add other device ids if necessary
      -
      -

      7.29 kodi

      +
      +

      7.29 kodi

      -
      -

      7.29.1 tasks

      +
      +

      7.29.1 tasks

        -
      1. Install KODI
        +
      2. Install KODI
      -
      -

      7.29.2 templates

      +
      +

      7.29.2 templates

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

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

      -
      -

      7.29.3 files

      +
      +

      7.29.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. @@ -4899,14 +4890,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 -->
@@ -5457,17 +5448,17 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
    • -
    -

    7.30 dvd

    +
    +

    7.30 dvd

    -
    -

    7.30.1 tasks

    +
    +

    7.30.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
@@ -5507,8 +5498,8 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
    -
    -

    7.31 template-test

    +
    +

    7.31 template-test

    ---
@@ -5524,7 +5515,7 @@ This file maps the keys defined in Lircmap.xml to actions within kodi.
    -
    {{ ansible_managed_file | comment }}
+
    {{ ansible_managed | comment }}
 
 Section "ServerLayout"
     Identifier     "Layout0"
@@ -5749,12 +5740,12 @@ EndSection
    -
    -

    7.32 wakeup

    +
    +

    7.32 wakeup

    -
    -

    7.32.1 defaults

    +
    +

    7.32.1 defaults

    ---
@@ -5764,8 +5755,8 @@ EndSection
    -
    -

    7.32.2 tasks

    +
    +

    7.32.2 tasks

    ---
@@ -5786,11 +5777,11 @@ EndSection
    -
    -

    7.32.3 templates

    +
    +

    7.32.3 templates

    -
    {{ ansible_managed_file | comment }}
+
    {{ ansible_managed | comment }}
 
 # Activate/deactivate ACPIWakeup with yes/no:
 ACPI_ENABLED="{% if wakeup_method == 'acpiwakeup' %}yes{% else %}no{% endif %}"
@@ -5813,12 +5804,12 @@ ACPI_START_AHEAD=5
    -
    -

    7.33 grub-config

    +
    +

    7.33 grub-config

    -
    -

    7.33.1 default variables

    +
    +

    7.33.1 default variables

    system:
@@ -5830,8 +5821,8 @@ ACPI_START_AHEAD=5
    -
    -

    7.33.2 tasks

    +
    +

    7.33.2 tasks

    ---
@@ -5856,8 +5847,8 @@ ACPI_START_AHEAD=5
    -
    -

    7.33.3 templates

    +
    +

    7.33.3 templates

    #!/bin/sh
@@ -5880,8 +5871,8 @@ menuentry "PowerOff" {
    -
    -

    7.33.4 handlers

    +
    +

    7.33.4 handlers

    ---
@@ -5899,15 +5890,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.
@@ -6084,8 +6075,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 = '''
@@ -6209,8 +6200,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)
      • @@ -6492,8 +6483,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
@@ -6566,7 +6557,7 @@ This section contains custom modules for the yaVDR Playbooks. They are used to c

    Autor: Alexander Grothe <seahawk1986@gmx.de>

    -

    Created: 2018-01-16 Di 12:51

    +

    Created: 2018-01-16 Di 13:07

    Validate

    diff --git a/Manual.org b/Manual.org index fefdf3a..12015c8 100644 --- a/Manual.org +++ b/Manual.org @@ -236,16 +236,11 @@ localhost connection=local #+END_SRC * Group Variables -** default text for templates used by ansible -#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes :padline no +** PPAs +#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes --- # file: group_vars/all -# this is the standard text to put in templates -ansible_managed_file: "*** YAVDR: ANSIBLE MANAGED FILE ***\norigin: {file}" -#+END_SRC -** PPAs -#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes branch: experimental ppa_owner: 'ppa:yavdr' # add the following PPAs @@ -566,7 +561,7 @@ yavdr-common executes the following tasks: #+END_SRC *** templates #+BEGIN_SRC c :tangle roles/yavdr-common/templates/90-norecommends.j2 :mkdirp yes :padline no -{{ ansible_managed_file | comment('c') }} +{{ ansible_managed | comment('c') }} // Recommends are as of now still abused in many packages APT::Install-Recommends "0"; APT::Install-Suggests "0"; @@ -2074,7 +2069,7 @@ KillMode=mixed ***** Drop-in snippet for vdr.service #+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/vdr-xorg.conf :mkdirp yes :padline no -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} [Unit] After=x@vt7.service Wants=x@vt7.service @@ -2083,7 +2078,7 @@ Wants=x@vt7.service ***** .xinitrc #+BEGIN_SRC shell :tangle roles/yavdr-xorg/templates/.xinitrc.j2 :mkdirp yes :padline no #!/bin/bash -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} exec openbox-session #+END_SRC ***** xorg.conf @@ -2110,7 +2105,7 @@ Section "Extensions" EndSection #+END_SRC #+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg.conf.j2 -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} Section "ServerLayout" Identifier "Layout0" @@ -2215,7 +2210,7 @@ EndSection #+END_SRC #+BEGIN_SRC shell :tangle roles/template-test/templates/xorg.conf_test.j2 -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} Section "ServerLayout" Identifier "Layout0" @@ -3436,7 +3431,7 @@ systemctl --user isolate yavdr-desktop.target **** smb.conf ***** global settings #+BEGIN_SRC yaml :tangle roles/samba-config/templates/smb.conf.j2 :mkdirp yes :padline no -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} #======================= Global Settings ======================= @@ -3645,7 +3640,7 @@ dependencies: #+END_SRC *** templates #+BEGIN_SRC conf :tangle roles/autoinstall-atric-usb/templates/lirc_options.conf.j2 :padline no -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} [lircd] nodaemon = False @@ -3716,7 +3711,7 @@ dependencies: #+END_SRC *** templates #+BEGIN_SRC conf :tangle roles/autoinstall-yausbir/templates/lirc_options.conf.j2 :padline no -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} [lircd] nodaemon = False @@ -3972,7 +3967,7 @@ This file maps the keys defined in Lircmap.xml to actions within kodi. dest: /tmp/test.txt #+END_SRC #+BEGIN_SRC shell :tangle roles/template-test/templates/xorg.conf_test.j2 -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} Section "ServerLayout" Identifier "Layout0" @@ -4219,7 +4214,7 @@ wakeup_method: "acpiwakeup" #+END_SRC *** templates #+BEGIN_SRC jinja2 :tangle roles/wakeup/templates/vdr-addon-acpiwakeup.conf.j2 :padline no -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} # Activate/deactivate ACPIWakeup with yes/no: ACPI_ENABLED="{% if wakeup_method == 'acpiwakeup' %}yes{% else %}no{% endif %}" diff --git a/ansible.cfg b/ansible.cfg index b3b8f36..2e2d030 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,3 +1,5 @@ [defaults] callback_plugins = plugins/callbacks callback_whitelist = auto_tags +ansible_managed = *** ANSIBLE MANAGED FILE *** + template: {file} \ No newline at end of file diff --git a/group_vars/all b/group_vars/all index 5ed5da3..59433d5 100644 --- a/group_vars/all +++ b/group_vars/all @@ -1,8 +1,6 @@ --- # file: group_vars/all -# this is the standard text to put in templates -ansible_managed_file: "*** YAVDR: ANSIBLE MANAGED FILE ***\norigin: {file}" branch: experimental ppa_owner: 'ppa:yavdr' # add the following PPAs diff --git a/roles/autoinstall-atric-usb/templates/lirc_options.conf.j2 b/roles/autoinstall-atric-usb/templates/lirc_options.conf.j2 index e2b2290..aa58175 100644 --- a/roles/autoinstall-atric-usb/templates/lirc_options.conf.j2 +++ b/roles/autoinstall-atric-usb/templates/lirc_options.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} [lircd] nodaemon = False diff --git a/roles/autoinstall-yausbir/templates/lirc_options.conf.j2 b/roles/autoinstall-yausbir/templates/lirc_options.conf.j2 index 7513564..f4bc0c0 100644 --- a/roles/autoinstall-yausbir/templates/lirc_options.conf.j2 +++ b/roles/autoinstall-yausbir/templates/lirc_options.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} [lircd] nodaemon = False diff --git a/roles/samba-config/templates/smb.conf.j2 b/roles/samba-config/templates/smb.conf.j2 index 42b03d9..e744160 100644 --- a/roles/samba-config/templates/smb.conf.j2 +++ b/roles/samba-config/templates/smb.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} #======================= Global Settings ======================= diff --git a/roles/wakeup/templates/vdr-addon-acpiwakeup.conf.j2 b/roles/wakeup/templates/vdr-addon-acpiwakeup.conf.j2 index 92ebfa7..eb3c893 100644 --- a/roles/wakeup/templates/vdr-addon-acpiwakeup.conf.j2 +++ b/roles/wakeup/templates/vdr-addon-acpiwakeup.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} # Activate/deactivate ACPIWakeup with yes/no: ACPI_ENABLED="{% if wakeup_method == 'acpiwakeup' %}yes{% else %}no{% endif %}" diff --git a/roles/yavdr-common/templates/90-norecommends.j2 b/roles/yavdr-common/templates/90-norecommends.j2 index e58919b..130f723 100644 --- a/roles/yavdr-common/templates/90-norecommends.j2 +++ b/roles/yavdr-common/templates/90-norecommends.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment('c') }} +{{ ansible_managed | comment('c') }} // Recommends are as of now still abused in many packages APT::Install-Recommends "0"; APT::Install-Suggests "0"; diff --git a/roles/yavdr-xorg/templates/.xinitrc.j2 b/roles/yavdr-xorg/templates/.xinitrc.j2 index 00dd16e..4b70616 100644 --- a/roles/yavdr-xorg/templates/.xinitrc.j2 +++ b/roles/yavdr-xorg/templates/.xinitrc.j2 @@ -1,3 +1,3 @@ #!/bin/bash -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} exec openbox-session diff --git a/roles/yavdr-xorg/templates/vdr-xorg.conf b/roles/yavdr-xorg/templates/vdr-xorg.conf index 1c09aae..bd6046b 100644 --- a/roles/yavdr-xorg/templates/vdr-xorg.conf +++ b/roles/yavdr-xorg/templates/vdr-xorg.conf @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} [Unit] After=x@vt7.service Wants=x@vt7.service diff --git a/roles/yavdr-xorg/templates/xorg.conf.j2 b/roles/yavdr-xorg/templates/xorg.conf.j2 index 1bcd268..4bbed53 100644 --- a/roles/yavdr-xorg/templates/xorg.conf.j2 +++ b/roles/yavdr-xorg/templates/xorg.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed_file | comment }} +{{ ansible_managed | comment }} Section "ServerLayout" Identifier "Layout0"