frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
cbce3852d9
yavdr-ansible/Manual.org

6262 lines
207 KiB
Org Mode
Raw Normal View History

cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
# -*- mode: org; -*-
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
* Settings for Export :noexport:
merge
2017-05-12 18:21:26 +02:00
:DOCUMENT_OPTIONS:
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="http://www.pirilampo.org/styles/readtheorg/css/htmlize.css"/>
#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="http://www.pirilampo.org/styles/readtheorg/css/readtheorg.css"/>
#+HTML_HEAD: <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
#+HTML_HEAD: <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
#+HTML_HEAD: <script type="text/javascript" src="http://www.pirilampo.org/styles/lib/js/jquery.stickytableheaders.min.js"></script>
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
#+HTML_HEAD: <script type="text/javascript" src="http://www.pirilampo.org/styles/readtheorg/js/readtheorg.js"></script>
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+OPTIONS: ^:nil
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
# Local Variables:
# org-src-preserve-indentation: t
# End:
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
#+PROPERTY: header-args :mkdirp yes :padline no
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
#+TITLE: Ansible Playbooks for yaVDR 0.7
#+Author: Alexander Grothe <seahawk1986@gmx.de>
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
#+STARTUP: latexpreview
#+LATEX_CLASS_OPTIONS: [ngerman,a4paper,locale=DE,koma,palatino,DIV=15,BCOR=15mm]
#+LATEX_HEADER: \usepackage[margin=3.0cm]{geometry}
#+LATEX_HEADER: \usepackage[ngerman]{babel}
#+LATEX_HEADER: \usepackage{palatino}
Add explanatory section to yavdr-xorg
2017-08-01 10:40:53 +02:00
#+LATEX_HEADER: \renewcommand*\ttdefault{cmvtt}
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
#+LATEX_HEADER: \usepackage{rotating}
#+LATEX_HEADER: \usepackage{paralist}
#+LATEX_HEADER: \usepackage{booktabs}
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
#+LATEX_HEADER: \usepackage{titlesec}
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
#+LATEX_HEADER: \usepackage[locale=DE,seperr,repeatunits=true,trapambigerr=false,tophrase={{ bis }}]{siunitx}
Add explanatory section to yavdr-xorg
2017-08-01 10:40:53 +02:00
#+LATEX_HEADER: \usemintedstyle{lovelace}
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
#+LATEX: \defaultfontfeatures{Ligatures=TeX}
#+LATEX_HEADER: \usepackage{parskip}
Add explanatory section to yavdr-xorg
2017-08-01 10:40:53 +02:00
# #+LATEX_HEADER_EXTRA:
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
#+EXCLUDE_TAGS: noexport
Update Manual.org
2017-02-28 17:40:04 +01:00
:END:
Update TODO list
2017-05-18 16:06:31 +02:00
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
* User Stories
** yavdr-full
A User wants to install yaVDR without customization and relies on full automation.
After installing a supported Ubuntu Server version and (if needed) setting up the network connection, the install script is downloaded and started.
The install script adds the ansible PPA, installs ansible and other basic dependencies and runs the automated installation process.
Several roles are used to tie everything together:
- yavdr-common :: installs the basic set of packages needed and preconfigures the system (package sources, package manager settings, entires for network ports, directory structure etc.). Also collects information about the system
- autoinstall-ubuntu-drivers :: uses Ubuntu's automatic detection for additional drivers (e.g. proprietary nvidia driver, microcode updates, VirtualBox guest additions)
- vdr :: install the vdr package and required plugins
add pulseaudio role
2017-06-22 12:10:23 +02:00
- pulseaudio :: install and preconfigure pulseaudio
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
- yavdr-network :: configure WOL, add nfs client capabilites, install avahi-linker
- samba-server :: install and preconfigure a samba server
- nfs-server :: install nfs-kernelserver and preconfigure nfs exports (and avahi-announcements)
- autoinstall-satip :: install vdr-plugin-satip if a Sat>IP server has been found
- autoinstall-targavfd :: install vdr-plugin-targavfd if display is connected
- autoinstall-imonlcd :: install vdr-plugin-imonlcd if a matchind display is connected
- yavdr-xorg :: install and configure a systemd user session with a running X-server. A frontend script will manage VDR's frontend and other applications like KODI. Also choose the best possible output plugin.
- grub-config :: update grub configuration based on executed roles
*** Using vdr, pulseaudio and xorg together
Do not export two sections
2017-11-09 09:52:00 +01:00
* Notes :noexport:
Update TODO list
2017-05-18 16:06:31 +02:00
:PROPERTIES:
Do not export two sections
2017-11-09 09:52:00 +01:00
:noexport: nil
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
:END:
Update TODO list
2017-05-18 16:06:31 +02:00
** TODO [#A] optimize and document data structure for xorg parsing script
** TODO [#A] xorg.conf templates for intel, nvidia, noveau and radeon drivers
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
*** STARTED BusID für (nvidia) Grafikkarten aus lspci auslesen
Format: "%d:%d:%d" (lspci liefert es als "%04x:%02x:%02x.%x", domain, bus, device, function)
- Wie mit mehreren GPUs umgehen? Priorität bzw. Reihenfolge?
- Was ist mit NVidia Optimus/Bumblebee (AFAIK keine VDPAU-Funktionalität)?
- Wie BusID der xrandr-Ausgabe zuordnen?
Use english section title
2018-05-12 22:10:41 +02:00
*** NVIDIA-Documentation about the BusID:
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
**** What is the format of a PCI Bus ID?
Different tools have different formats for the PCI Bus ID of a PCI device.
The X server's "BusID" X configuration file option interprets the BusID string in the format "bus@domain:device:function" (the "@domain" portion is only needed if the PCI domain is non-zero), in decimal. More specifically,
"%d@%d:%d:%d", bus, domain, device, function
in printf(3) syntax. NVIDIA X driver logging, nvidia-xconfig, and nvidia-settings match the X configuration file BusID convention.
The lspci(8) utility, in contrast, reports the PCI BusID of a PCI device in the format "domain:bus:device.function", printing the values in hexadecimal. More specifically,
"%04x:%02x:%02x.%x", domain, bus, device, function
in printf(3) syntax. The "Bus Location" reported in the /proc/driver/nvidia/gpus/0..N/information files matches the lspci format.
**** Parsen der /proc/driver/nvidia/gpus/*/information Dateien
#+BEGIN_SRC python
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
# read the BusID for nvidia cards and the model name
# from the /proc/driver/nvidia/gpus/*/information file(s)
from __future__ import print_function
import glob
import re
BusID_RE = re.compile((
'(?P<domain>[0-9a-fA-F]+)'
':'
'(?P<bus>[0-9a-fA-F]+)'
':'
'(?P<device>[0-9a-fA-F]+)'
'\.'
'(?P<function>[0-9a-fA-F]+)'
))
Model_RE = re.compile('Model:\s+(.*)')
def get_BusIDs():
for gpu_info in glob.glob('/proc/driver/nvidia/gpus/*/information'):
with open(gpu_info) as f:
data = f.read()
match = BusID_RE.search(data)
if match:
BusID = "{:d}@{:d}:{:d}:{:d}".format(*(int(n, 16) for n in match.groups()))
yield BusID, Model_RE.match(data).groups()[0]
if __name__ == '__main__':
BusIDs = [BusID for BusID in get_BusIDs()]
print(BusIDs)
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
#+END_SRC
Update TODO list
2017-05-18 16:06:31 +02:00
** TODO [#B] plan for customization of xorg settings by the user
either directly or using a configuration wizard or a web frontend
** SOMEDAY [#C] select best frontend based on GPU
- intel :: softhddevice-vpp
- amd :: softhddevice-vpp
- nvidia :: softhddevice-openglosd (if no HEVC channels are needed)
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
* Introduction
Install eventlircd after lircd has been stopped
2018-05-06 16:32:39 +02:00
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.
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
* 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 [[http://ansible.com][Ansible]].
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
This Manual is written in org-mode for Emacs and can rewrite the complete ansible configuration if you call ~org-babel-tangle~ from within emacs.
cleanup
2017-03-13 15:27:21 +01:00
To use this playbook on a Ubuntu Server Installation you need to run the following commands:
#+BEGIN_SRC shell
sudo apt-get install git
git clone https://github.com/yavdr/yavdr-ansible.git
cd yavdr-ansible
Update installation instructions
2018-01-19 07:49:27 +01:00
git checkout bionic
cleanup
2017-03-13 15:27:21 +01:00
sudo ./install-yavdr.sh
#+END_SRC
ForceFullCompositionPipeline for nvidia cards to prevent screen tearing when playing video with xineliboutput-sxfe or other video players which use opengl components
2018-01-03 13:19:59 +01:00
We use a callback to generate tags for all roles autmatically:
#+INCLUDE: "ansible.cfg" src conf
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
** Install script for local usage
#+BEGIN_SRC shell :tangle install-yavdr.sh :shebang "#!/bin/bash"
Add PPA for Ansible 2.6 so ansible_virtualization_type and ansible_virtualization_role are always defined. This ist important on older Hardware (e.g. AMD64 3000+).
2018-09-05 12:23:30 +02:00
set -e
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
if (( $EUID != 0 )); then
Recommend sudo -H
2017-12-16 18:02:33 +01:00
echo "This script must be run using sudo -H or as root"
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
exit
fi
# update packages
Add PPA for Ansible 2.6 so ansible_virtualization_type and ansible_virtualization_role are always defined. This ist important on older Hardware (e.g. AMD64 3000+).
2018-09-05 12:23:30 +02:00
apt update
apt -y install software-properties-common
add-apt-repository -y ppa:ansible/ansible-2.6
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
# install required packages
Add python-jmespath for the json_filter functionality provied by ansible
2018-08-10 10:52:10 +02:00
apt-get -y install --no-install-recommends ansible python-jmespath
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
# TODO: run ansible on local host
Fix case of boolean variable
2018-01-07 19:00:27 +01:00
ansible-playbook yavdr07.yml -b -i 'localhost_inventory' --connection=local --tags="all" --extra-vars "first_run=True"
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
#+END_SRC
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
* Playbooks
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
** yavdr07.yml
Add facts script for Sat>IP
2017-03-01 11:59:11 +01:00
The ~yavdr07.yml~ playbook sets up a fully-featured yaVDR installation:
more formatting corrections, add yavdr-remote role
2017-06-20 16:20:24 +02:00
#+BEGIN_SRC yaml :tangle yavdr07.yml :mkdirp yes :padline no
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
---
# file: yavdr07.yml
# this playbook sets up a complete yaVDR 0.7 installation
- name: set up yaVDR
hosts: all
become: true
roles:
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- yavdr-common # install and configure the basic system
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
- collect-facts # query system facts
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- autoinstall-ubuntu-drivers # use ubuntu-drivers to install proprietary dirvers
# (e.g. nvidia, virtualbox)
Update playbook
2018-01-18 15:16:15 +01:00
# - nvidia-experimental # install very recent nvidia dirver from ppa:graphics-drivers/ppa
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- vdr # install vdr and related packages
Rearrange Installation of xineliboutput when a VM is detected
2018-09-04 13:21:32 +02:00
- autoinstall-virtualbox-guest
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- yavdr-network # enable network client capabilities
- samba-install # install samba server
- samba-config # configure samba server
- nfs-server # install nfs server
- pulseaudio # install pulseaudio
- yavdr-xorg # graphical session
- yavdr-remote # remote configuration files, services and scripts
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- yavdr-desktop # openbox session with yavdr frontend script
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- autoinstall-satip # install vdr-plugin-satip if a Sat>IP server has been found
- autoinstall-targavfd # install vdr-plugin-targavfd if display is connected
- autoinstall-imonlcd # install vdr-plugin-imonlcd if a matchind display is connected
Fix some spelling errors
2018-08-10 08:13:21 +02:00
- autoinstall-pvr350 # install vdr-plugin-pvr350 if a matching card is detected
add basic XDG_RUNTIME_DIR
2017-07-31 00:22:10 +02:00
- autoinstall-hauppauge-pvr # install vdr-plugin-pvrinput if a matching card is found
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- autoinstall-dvbsddevice # install vdr-plugin-dvbsddevice if a matching card is detected
Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino <luigidc@gmx.de> Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added
2017-11-13 09:46:51 +01:00
- autoinstall-hardware-irmp # install yavdr-hardware-irmp if a matching usb device is detected
Add role for automatic configuration of Atric IR-WakeupUSB to playbook
2018-01-01 22:51:57 +01:00
- autoinstall-atric-usb # preconfigure lircd for Atric IR-WakeupUSB receiver
Fix USB IDs, add new role to playbook yavdr07.yml
2018-01-16 09:12:11 +01:00
- autoinstall-yausbir # preconfigure lircd for yaUsbIR receiver
Fix some spelling errors
2018-08-10 08:13:21 +02:00
- autoinstall-dvbsky-firmware # download and install required firmware files for dvbsky cards
- autoinstall-firmware # download and install firmware files for dvb devices
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
- kodi
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- dvd # set up packages and a udev rule to allow kodi and other players
# to play and eject optical media
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
- wakeup # set up wakeup methods for rtc etc.
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- grub-config # configure grub
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
handlers:
Ansible API change: use import_tasks instead of include
2017-11-12 19:07:21 +01:00
- import_tasks: handlers/main.yml
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
** yavdr07-headless.yml
For a headless server installation ~yavdr07-headless.yml~ is a good choice
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle yavdr07-headless.yml :mkdirp yes :padline no
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
---
# file: yavdr07-headless.yml
# this playbook set up a headless yaVDR 0.7 installation
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
- name: set up a headless yaVDR server
hosts: all
become: true
roles:
- yavdr-common
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
- collect-facts # query system facts
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
- vdr
- yavdr-network
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- samba-install
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
- samba-config
- nfs-server
- grub-config
Fix some spelling errors
2018-08-10 08:13:21 +02:00
- autoinstall-satip # install vdr-plugin-satip if a Sat>IP server has been found
- autoinstall-pvr350 # install vdr-plugin-pvr350 if a matching card is detected
- autoinstall-hauppauge-pvr # install vdr-plugin-pvrinput if a matching card is found
- autoinstall-dvbsddevice # install vdr-plugin-dvbsddevice if a matching card is detected
- autoinstall-dvbsky-firmware # download and install required firmware files for dvbsky cards
- autoinstall-firmware # download and install firmware files for dvb devices
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
- wakeup
add tasks to playbooks, add dependency for on_vdr script to xorg install
2017-07-30 15:21:05 +02:00
tags:
- always
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
handlers:
Ansible API change: use import_tasks instead of include
2017-11-12 19:07:21 +01:00
- import_tasks: handlers/main.yml
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
#+END_SRC
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
* 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:
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC conf :tangle localhost_inventory :mkdirp yes :padline no
change group name for inventory file
2017-11-12 21:17:44 +01:00
[local]
Add facts script for Sat>IP
2017-03-01 11:59:11 +01:00
localhost connection=local
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
#+END_SRC
* Group Variables
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
** PPAs
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
---
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# file: group_vars/all
Change PPAs for experimental bionic packages
2017-12-16 16:33:15 +01:00
branch: experimental
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
ppa_owner: 'ppa:yavdr'
Minor changes, update task and variable descriptions
2017-07-30 14:54:43 +02:00
# add the following PPAs
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
repositories:
Change PPAs for experimental bionic packages
2017-12-16 16:33:15 +01:00
- '{{ ppa_owner }}/{{branch}}-main'
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
- '{{ ppa_owner }}/{{branch}}-vdr'
Change PPAs for experimental bionic packages
2017-12-16 16:33:15 +01:00
#- '{{ ppa_owner }}/{{branch}}-yavdr'
#- '{{ ppa_owner }}/{{branch}}-kodi'
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
** VDR user, directories, special configuration and plugins
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# properties of the user vdr and vdr-related options
Set xineliboutput as output plugin for virtualbox
2018-02-12 16:37:41 +01:00
# NOTE: user name, uid and confdir must match the values set by the vdr package
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
vdr:
user: vdr
group: vdr
uid: 666
gid: 666
home: /var/lib/vdr
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
confdir: /var/lib/vdr
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
recdir: /srv/vdr/video
hide_first_recording_level: false
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
safe_dirnames: true # escape characters (useful for windows clients and FAT/NTFS file systems)
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
override_vdr_charset: false
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# add the vdr plugins you want to install
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
vdr_plugins:
- vdr-plugin-devstatus
- vdr-plugin-markad
Update Manual.org
2017-06-19 07:51:19 +02:00
- vdr-plugin-softhddevice-vpp
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
** Media directories
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
# dictionary of directories for (shared) files. Automatically exported via NFS and Samba if those roles are enabled
media_dirs:
audio: /srv/audio
Fix video directory path
2017-12-17 09:16:50 +01:00
video: /srv/video
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
pictures: /srv/picture
files: /srv/files
backups: /srv/backups
recordings: '{{ vdr.recdir }}'
#+END_SRC
** NFS
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
nfs:
minor changes to comments
2017-03-16 10:26:32 +01:00
insecure: false # set to true for OS X clients or if you plan to use libnfs as unprivileged user (e.g. KODI)
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
#+END_SRC
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
** Samba
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
samba:
workgroup: YAVDR
minor changes to comments
2017-03-16 10:26:32 +01:00
windows_compatible: '{{ vdr.safe_dirnames }}' # set to true to disable unix extensions, enable follow symlinks and wide links
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
** Additional packages
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# additional packages you want to install
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
extra_packages:
sort packages by name
2017-11-09 09:50:00 +01:00
- bpython
- bpython3
Enable and start additional services after the avahi-linker installation
2017-07-16 08:29:13 +02:00
- htop
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
- tree
sort packages by name
2017-11-09 09:50:00 +01:00
- vim
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
- w-scan
Add yavdr bootsplash (adds up to 2-3 seconds to boot time) choose nosplash instead of splash to disable plymouth
2017-12-26 12:58:29 +01:00
- plymouth-theme-yavdr-logo
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
** System pre-configuration
#+BEGIN_SRC yaml :tangle group_vars/all :mkdirp yes
Do not set vdr lirc socket if frontend is set to "kodi"
2017-07-16 09:27:04 +02:00
frontend: vdr
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
#system:
# shutdown: poweroff
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
wakeup_method: acpiwakeup
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
grub:
timeout: 0
Add yavdr bootsplash (adds up to 2-3 seconds to boot time) choose nosplash instead of splash to disable plymouth
2017-12-26 12:58:29 +01:00
boot_options: quiet splash
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
* Roles
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
** install-dependencies
*** tasks
**** main.yml
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/install-packages/tasks/main.yml :mkdirp yes :padline no
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
---
- name: apt | install packages
apt:
name: '{{ item }}'
state: present
install_recommends: no
Add cache timeout to apt operation
2018-04-06 09:06:03 +02:00
cache_valid_time: 60
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
with_items:
'{{ packages }}'
#+END_SRC
Update section title
2018-01-18 15:17:26 +01:00
** nvidia experimental drivers
Set nvidia-experimental driver to nvidia-396
2018-05-20 09:13:23 +02:00
install nvidia-396 from ppa:graphics-drivers/ppa
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
*** tasks
**** main.yml
rename nvidia-387 to nvidia-experimental
2018-01-18 15:15:23 +01:00
#+BEGIN_SRC yaml :tangle roles/nvidia-experimental/tasks/main.yml :mkdirp yes :padline no
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
---
- name: add ppa:graphics-drivers/ppa
apt_repository:
repo: 'ppa:graphics-drivers/ppa'
state: present
update_cache: yes
Add some tags for ppa related tasks
2017-12-28 17:28:43 +01:00
tags:
- ppa
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
Set nvidia-experimental driver to nvidia-396
2018-05-20 09:13:23 +02:00
- name: install nvidia-396 and other required packages
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
Set nvidia-experimental driver to nvidia-396
2018-05-20 09:13:23 +02:00
- nvidia-396
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
- nvidia-settings
Add some tags for ppa related tasks
2017-12-28 17:28:43 +01:00
tags:
- packages
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
#+END_SRC
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
** yavdr-common
This role is used to set up a basic yaVDR installation. It creates the directories, installs the vdr and other useful packages.
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** default variables
Add facts script for Sat>IP
2017-03-01 11:59:11 +01:00
This section is for reference only, please use the files in ~global_vars~ for customizations.
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline no
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
---
# file: roles/yavdr-common/defaults/main.yml
Add facts script for Sat>IP
2017-03-01 11:59:11 +01:00
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
Add facts script for Sat>IP
2017-03-01 11:59:11 +01:00
**** 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.
Cleanup
2017-07-28 16:09:11 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
branch: unstable
repositories:
- 'ppa:yavdr/main'
- 'ppa:yavdr/unstable-main'
- 'ppa:yavdr/{{branch}}-vdr'
- 'ppa:yavdr/{{branch}}-kodi'
- 'ppa:yavdr/{{branch}}-yavdr'
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
**** Drivers
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
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*.
Cleanup
2017-07-28 16:09:11 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
drivers:
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
sundtek: auto
ddvb-dkms: auto
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
**** Additional Packages
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
Add additional packages you would like to have on your installation to this list
Cleanup
2017-07-28 16:09:11 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
extra_packages:
- vim
- tree
- w-scan
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
**** VDR
This section allows you to set the recording directory, the user and group that runs the vdr and it's home directory.
- user :: the vdr user name
- group :: the main group for the user vdr
- uid :: the user id for the user vdr
- gid :: the group id for the group vdr
- home :: the home directory for the user vdr
- recdir :: the recording directory used by VDR
- hide_first_recording_level :: let vdr hide the first directory level of it's recording directory so the content of multiple directories is shown merged together
- safe_dirnames :: replace special characters which are not compatible with Windows file systems and Samba shares
- override_vdr_charset :: workaround for channels with weird EPG encodings, e.g. Sky
Cleanup
2017-07-28 16:09:11 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/defaults/main.yml :mkdirp yes :padline yes
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
vdr:
user: vdr
group: vdr
uid: 666
gid: 666
home: /var/lib/vdr
recdir: /srv/vdr/video
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
hide_first_recording_level: false
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
safe_dirnames: true
override_vdr_charset: false
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** tasks
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
yavdr-common executes the following tasks:
update Manual.org
2017-02-28 16:31:11 +01:00
**** main.yml
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/main.yml :mkdirp yes :padline no
---
# file: roles/yavdr-common/tasks/main.yml
- name: basic installation
block:
- import_tasks: configure_apt.yml
- import_tasks: configure_system.yml
- import_tasks: create_directories.yml
Create drop-in for sudo for vdr user this allows to restart vdr.service and reboot the system
2018-05-23 09:55:57 +02:00
- import_tasks: create_sudoers.yml
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
tags: [install]
#+END_SRC
update Manual.org
2017-02-28 16:31:11 +01:00
***** Disable default installation of recommended packages
Add facts script for Sat>IP
2017-03-01 11:59:11 +01:00
This task prevents apt to automatically install all recommended dependencies for packages:
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_apt.yml :mkdirp yes :padline no
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
---
Fix indentations
2017-03-02 09:06:19 +01:00
- name: apt | prevent automatic installation of recommended packages
template:
src: templates/90-norecommends.j2
dest: /etc/apt/apt.conf.d/90norecommends
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
update Manual.org
2017-02-28 16:31:11 +01:00
#+END_SRC
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
***** Set up package repositories
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_apt.yml :mkdirp yes
- name: add PPAs
apt_repository:
repo: '{{ item }}'
state: present
Don't update cache when adding ppas, this is done in the next step
2018-08-03 12:07:33 +02:00
update_cache: no
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
with_items: '{{ repositories }}'
Add some tags for ppa related tasks
2017-12-28 17:28:43 +01:00
tags:
- ppa
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
- name: run apt-get dist-upgrade
apt:
upgrade: dist
update_cache: yes
#+END_SRC
Set bash instead of dash, update default variables for grub-config
2017-03-03 00:35:14 +01:00
***** Use bash instead of dash
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_system.yml :mkdirp yes
Revert "use debconf module instead of shell command" openbox autostart calls the autostart script with sh as shell and using ansible's debconf module does not change dash to bash successfully, so for the moment we need to use the shell command instead. This reverts commit 4170935a5aa60a782585ad8beb3369a02f94fb25.
2018-08-09 10:07:20 +02:00
- name: use bash instead of dash
shell: |
echo "set dash/sh false" | debconf-communicate
dpkg-reconfigure -f noninteractive dash
Set bash instead of dash, update default variables for grub-config
2017-03-03 00:35:14 +01:00
#+END_SRC
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
***** create user vdr
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_system.yml :exports none :mkdirp yes
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
- name: create vdr group
group:
gid: '{{ vdr.gid }}'
state: present
name: '{{ vdr.group }}'
- name: create vdr user
user:
name: '{{ vdr.user }}'
group: '{{ vdr.group }}'
uid: '{{ vdr.uid }}'
home: '{{ vdr.home }}'
shell: '/bin/bash'
state: present
append: true
#+END_SRC
Set bash instead of dash, update default variables for grub-config
2017-03-03 00:35:14 +01:00
***** Disable release-upgrade notifications
run task only if file exists
2017-11-22 11:37:20 +01:00
****** SOMEDAY move from lineinfile to template
:LOGBOOK:
- State "SOMEDAY" from "TODO" [2017-11-22 Mi 10:59]
:END:
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_system.yml :mkdirp yes
Set bash instead of dash, update default variables for grub-config
2017-03-03 00:35:14 +01:00
- name: disable release-upgrade notifications
lineinfile:
dest: /etc/update-manager/release-upgrades
backrefs: yes
state: present
regexp: '^(Prompt=).*$'
line: '\1never'
allow action to fail if file does not exist
2017-11-22 10:56:21 +01:00
ignore_errors: yes
run task only if file exists
2017-11-22 11:37:20 +01:00
with_first_found:
cleanup whitespace
2017-11-22 11:40:17 +01:00
- files:
run task only if file exists
2017-11-22 11:37:20 +01:00
- /etc/update-manager/release-upgrades
skip: true
Fix indentations
2017-03-02 09:06:19 +01:00
Set bash instead of dash, update default variables for grub-config
2017-03-03 00:35:14 +01:00
#+END_SRC
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
***** Install essential packages
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_system.yml :mkdirp yes
Fix indentations
2017-03-02 09:06:19 +01:00
- name: apt | install basic packages
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
- anacron
Add acl to essential packages
2017-11-09 14:48:35 +01:00
- acl
Fix indentations
2017-03-02 09:06:19 +01:00
- at
- bash-completion
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
#- biosdevname # caution: may change device names after a minimal installation!
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
- debconf-utils
Fix indentations
2017-03-02 09:06:19 +01:00
- linux-firmware
- psmisc
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
- python-kmodpy
python-requests is needed as dependency for satip_facts.py
2017-09-04 12:44:06 +02:00
- python-requests
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
- python-usb
rename fact files
2017-03-02 09:38:05 +01:00
- python3-usb
Fix indentations
2017-03-02 09:06:19 +01:00
- software-properties-common
- ssh
- wget
- wpasupplicant
- usbutils
- xfsprogs
update Manual.org
2017-02-28 16:31:11 +01:00
#+END_SRC
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
***** Install additional packages (user defined)
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/configure_system.yml
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
- name: apt | install extra packages
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
'{{ extra_packages }}'
#+END_SRC
Add additional files
2017-11-22 10:09:51 +01:00
***** create directories
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/create_directories.yml :exports none :mkdirp yes
Add additional files
2017-11-22 10:09:51 +01:00
- name: ensure /etc/yavdr exists
Fix indentation
2017-11-22 10:15:16 +01:00
file:
Add additional files
2017-11-22 10:09:51 +01:00
path: /etc/yavdr
state: directory
mode: 0755
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
- name: create media directories
file:
dest: '{{ item.value }}'
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
state: directory
mode: '0777'
with_dict: '{{ media_dirs }}'
#+END_SRC
Create drop-in for sudo for vdr user this allows to restart vdr.service and reboot the system
2018-05-23 09:55:57 +02:00
***** create sudoers drop-in for vdr
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/create_sudoers.yml :exports none :mkdirp yes
- name: create /etc/sudoers.d/yavdr from template
template:
src: templates/yavdr.sudoers.j2
dest: /etc/sudoers.d/yavdr
mode: '0444'
validate: visudo -cf %s
#+END_SRC
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
*** templates
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC c :tangle roles/yavdr-common/templates/90-norecommends.j2 :mkdirp yes :padline no
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment('c') }}
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
// Recommends are as of now still abused in many packages
APT::Install-Recommends "0";
APT::Install-Suggests "0";
#+END_SRC
Create drop-in for sudo for vdr user this allows to restart vdr.service and reboot the system
2018-05-23 09:55:57 +02:00
**** yavdr sudoers drop-in
Allow the vdr user to restart ~vdr.service~ and reboot the system
#+BEGIN_SRC shell :tangle roles/yavdr-common/templates/yavdr.sudoers.j2 :mkdirp yes :padline no
{{ vdr.user }} ALL=NOPASSWD: /bin/systemctl --no-block restart vdr.service
{{ vdr.user }} ALL=NOPASSWD: /bin/systemctl --no-block reboot
#+END_SRC
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
** collect facts about the system with custom modules
Change from tag to variable first_run
2018-01-07 18:45:01 +01:00
*** variables
#+BEGIN_SRC yaml :tangle roles/collect-facts/defaults/main.yml :mkdirp yes
Fix case of boolean variable
2018-01-07 19:00:27 +01:00
first_run: False
Change from tag to variable first_run
2018-01-07 18:45:01 +01:00
#+END_SRC
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
*** tasks
***** main.yml
#+BEGIN_SRC yaml :tangle roles/collect-facts/tasks/main.yml :mkdirp yes
- name: get information about usb and pci hardware and loaded kernel modules
hardware_facts:
usb: True
pci: True
modules: True
gpus: True
acpi_power_modes: True
Add some tags for ppa related tasks
2017-12-28 17:28:43 +01:00
tags:
- always
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
- debug:
var: '{{ item }}'
verbosity: 1
with_items:
- usb
- pci
- gpus
- modules
- acpi_power_modes
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- nvidia_detected
- intel_detected
- amd_detected
extend hardware_facts.py with bool variables for detected graphic card manufacturers
2017-11-22 09:24:33 +01:00
- virtualbox_detected
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
Collect detailed pci device information in variable pci_devices
2018-08-10 09:06:15 +02:00
- name: get detailed PCI device information
pci_facts:
tags:
- always
- debug:
var: pci_devices
only show output when ansible is called with -v
2018-08-10 09:09:34 +02:00
verbosity: 1
Collect detailed pci device information in variable pci_devices
2018-08-10 09:06:15 +02:00
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
- name: known vdr output plugins
Fix syntax error
2018-01-01 22:42:58 +01:00
set_fact:
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
vdr_output_plugins:
- softhddevice
- xineliboutput
- xine
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
** vdr
*** tasks
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
**** install the basic vdr packages
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes :padline no
Fix indentations
2017-03-02 09:06:19 +01:00
---
# file: roles/vdr/tasks/main.yml
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
Fix indentations
2017-03-02 09:06:19 +01:00
- name: apt | install basic vdr packages
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
- vdr
- vdrctl
- vdr-plugin-dbus2vdr
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
**** Add svdrp/svdrp-disc to /etc/services
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- name: add svdrp and svdrp-disc to /etc/services
Fix indentations
2017-03-02 09:06:19 +01:00
lineinfile:
dest: /etc/services
state: present
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
line: "{{ item }}"
with_items:
- "svdrp 6419/tcp"
- "svdrp-disc 6419/udp"
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
**** Set up the recording directory for the vdr user
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes
Fix indentations
2017-03-02 09:06:19 +01:00
- name: create vdr recdir
file:
state: directory
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
mode: 0775
dest: '{{ vdr.recdir }}'
- name: set option to use hide-first-recording-level patch
blockinfile:
dest: /etc/vdr/conf.d/04-vdr-hide-first-recordinglevel.conf
create: true
Fix condition
2017-12-19 20:10:39 +01:00
state: "{{ 'present' if vdr.hide_first_recording_level else 'absent' }}"
Fix indentations
2017-03-02 09:06:19 +01:00
block: |
[vdr]
--hide-first-recording-level
- name: create local dir in recdir
file:
state: directory
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
mode: '0775'
dest: '{{ vdr.recdir }}/local'
when:
vdr.hide_first_recording_level
Update role order, next try for a successfull local installation
2017-03-13 14:53:07 +01:00
# TODO: set recdir, user etc. in /etc/vdr/conf.d/
Add svdrp service definition, improve template
2017-03-01 21:11:56 +01:00
#+END_SRC
**** Install additional vdr plugins
The additional plugins to install can be set in the variable ~{{vdr_plugins}}~ in the group variables
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes
cleanup
2017-03-13 15:27:21 +01:00
- name: apt | install additional vdr plugins
Fix indentations
2017-03-02 09:06:19 +01:00
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
'{{ vdr_plugins | default({}) }}'
cleanup
2017-03-13 15:27:21 +01:00
notify: [ 'Restart VDR' ]
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
**** copy vdr configuration files (if they don't exist yet)
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes
- name: ensure vdr is stopped
systemd:
name: vdr.service
state: stopped
notify: [ 'Start VDR' ]
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
- name: "vdr configuration | copy remote.conf if it doesn't exist yet"
copy:
src: files/remote.conf
dest: '{{ vdr.confdir }}/remote.conf'
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
mode: 0644
force: no
- name: "vdr configuration | copy keymacros.conf if it doesn't exist yet"
copy:
src: files/keymacros.conf
dest: '{{ vdr.confdir }}/keymacros.conf'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
mode: 0644
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
force: no
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+END_SRC
rearrange some tasks
2018-02-12 10:27:01 +01:00
**** start vdr after network-online.target
#+BEGIN_SRC yaml :tangle roles/vdr/tasks/main.yml :mkdirp yes
Ensure /etc/systemd/system/vdr.service.d/ exists
2018-02-12 13:09:57 +01:00
- name: create directory for vdr.service systemd drop-in files
file:
dest: '{{ item }}'
state: directory
with_items:
- "/etc/systemd/system/vdr.service.d/"
rearrange some tasks
2018-02-12 10:27:01 +01:00
- name: systemd-drop-in | start vdr.service after network-online.target
template:
src: templates/systemd/network-online.j2
dest: /etc/systemd/system/vdr.service.d/network-online.conf
#+END_SRC
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
*** templates
rearrange some tasks
2018-02-12 10:27:01 +01:00
Start after network-online.target
#+BEGIN_SRC conf :tangle roles/vdr/templates/systemd/network-online.j2 :mkdirp yes
[Unit]
After=network-online.target
#+END_SRC
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
*** files
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
**** remote.conf
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
#+BEGIN_SRC conf :tangle roles/vdr/files/remote.conf :mkdirp yes :padline no
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
LIRC.Up KEY_UP
LIRC.Down KEY_DOWN
LIRC.Menu KEY_MENU
LIRC.Ok KEY_OK
LIRC.Back KEY_ESC
LIRC.Left KEY_LEFT
LIRC.Right KEY_RIGHT
LIRC.Red KEY_RED
LIRC.Green KEY_GREEN
LIRC.Yellow KEY_YELLOW
LIRC.Blue KEY_BLUE
LIRC.0 KEY_0
LIRC.1 KEY_1
LIRC.2 KEY_2
LIRC.3 KEY_3
LIRC.4 KEY_4
LIRC.5 KEY_5
LIRC.6 KEY_6
LIRC.7 KEY_7
LIRC.8 KEY_8
LIRC.9 KEY_9
LIRC.Info KEY_INFO
LIRC.Play KEY_PLAY
LIRC.Pause KEY_PAUSE
LIRC.Play/Pause KEY_PLAYPAUSE
LIRC.Stop KEY_STOP
LIRC.Record KEY_RECORD
LIRC.FastFwd KEY_FASTFORWARD
LIRC.FastRew KEY_REWIND
LIRC.Next KEY_NEXT
LIRC.Prev KEY_BACK
LIRC.Power KEY_POWER2
LIRC.Channel+ KEY_CHANNELUP
LIRC.Channel- KEY_CHANNELDOWN
LIRC.PrevChannel KEY_PREVIOUS
LIRC.Volume+ KEY_VOLUMEUP
LIRC.Volume- KEY_VOLUMEDOWN
LIRC.Mute KEY_MUTE
LIRC.Subtitles KEY_SUBTITLE
LIRC.Schedule KEY_EPG
LIRC.Channels KEY_CHANNEL
LIRC.Commands KEY_FAVORITES
LIRC.Audio KEY_MODE
LIRC.Timers KEY_TIME
LIRC.Recordings KEY_PVR
LIRC.Setup KEY_SETUP
LIRC.User0 KEY_TEXT
LIRC.User1 KEY_PROG1
LIRC.User2 KEY_PROG2
LIRC.User3 KEY_PROG3
LIRC.User4 KEY_PROG4
LIRC.User5 KEY_AUDIO
LIRC.User6 KEY_VIDEO
LIRC.User7 KEY_IMAGES
LIRC.User8 KEY_FN
LIRC.User9 KEY_SCREEN
XKeySym.Up Up
XKeySym.Down Down
XKeySym.Menu Home
XKeySym.Menu Tab
XKeySym.Menu KP_Home
XKeySym.Ok Return
XKeySym.Ok KP_Enter
XKeySym.Back BackSpace
XKeySym.Back KP_Separator
XKeySym.Left Left
XKeySym.Right Right
XKeySym.Up KP_Up
XKeySym.Down KP_Down
XKeySym.Left KP_Left
XKeySym.Right KP_Right
XKeySym.Red F1
XKeySym.Green F2
XKeySym.Yellow F3
XKeySym.Blue F4
XKeySym.0 0
XKeySym.1 1
XKeySym.2 2
XKeySym.3 3
XKeySym.4 4
XKeySym.5 5
XKeySym.6 6
XKeySym.7 7
XKeySym.8 8
XKeySym.9 9
XKeySym.0 KP_0
XKeySym.1 KP_1
XKeySym.2 KP_2
XKeySym.3 KP_3
XKeySym.4 KP_4
XKeySym.5 KP_5
XKeySym.6 KP_6
XKeySym.7 KP_7
XKeySym.8 KP_8
XKeySym.9 KP_9
XKeySym.Info End
XKeySym.Info KP_End
XKeySym.Pause F9
XKeySym.FastFwd F6
XKeySym.FastRew F5
XKeySym.Power Pause
XKeySym.Volume+ F12
XKeySym.Volume- F11
XKeySym.Volume+ KP_Add
XKeySym.Volume- KP_Subtract
XKeySym.Mute F10
XKeySym.User1 F5
XKeySym.User2 F6
XKeySym.User3 F7
XKeySym.User4 F8
XKeySym.User5 Print
XKeySym.User6 Scroll_Lock
XKeySym.User7 Insert
XKeySym.User8 KP_Divide
XKeySym.User9 KP_Multiply
XKeySym.Audio Menu
XKeySym.Channel+ Prior
XKeySym.Channel- Next
XKeySym.Channel+ KP_Prior
XKeySym.Channel- KP_Next
XKeySym.Volume+ XF86AudioRaiseVolume
XKeySym.Volume- XF86AudioLowerVolume
XKeySym.Mute XF86AudioMute
XKeySym.Stop XF86AudioStop
XKeySym.Play/Pause XF86AudioPlay
XKeySym.Prev XF86AudioPrev
XKeySym.Next XF86AudioNext
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
#+END_SRC
**** keymacros.conf
#+BEGIN_SRC conf :tangle roles/vdr/files/keymacros.conf :padline no
# Remote control key macros for VDR
#
# Format:
#
# macrokey key1 key2 key3...
# macrokey @plugin key1 key2 key3...
#
# See man vdr(5)
Red Recordings
Green Schedule
Yellow Info
Blue Timers
User0 @osdteletext
Trying some literate programming for this playbook
2017-02-20 14:29:15 +01:00
#+END_SRC
Update Manual.org
2017-02-28 17:40:04 +01:00
** STARTED yavdr-network
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** default variables
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-network/main.yml :mkdirp yes :padline no
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
install_avahi: true
#+END_SRC
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-network/tasks/main.yml :mkdirp yes :padline no
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
---
# this playbook sets up network services for a yaVDR installation
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
Add space
2017-12-17 14:37:03 +01:00
- name: apt | install packages for network services
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
- avahi-daemon
- avahi-utils
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
#- biosdevname # caution: this may change device names after a minimal installation!
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
- ethtool
- nfs-common
- vdr-addon-avahi-linker
- wakeonlan
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# Does this really work? We need a way to check if an interface supports WOL - Python Skript?
# - name: check WOL capabilities of network interfaces
# shell: 'ethtool {{ item }} | grep -Po "(?<=Supports\sWake-on:\s).*$"'
# register: wol
# with_items: '{% for interface in ansible_interfaces if interface != 'lo' and interface != 'bond0' %}'
small cleanup
2018-01-24 11:12:03 +01:00
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
- name: restart autofs if running
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
systemd:
name: autofs
state: restarted
enabled: yes
masked: no
- name: ensure autofs is running
systemd:
name: autofs
state: started
enabled: yes
masked: no
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
- name: restart avahi-linker if running
systemd:
name: avahi-linker
state: restarted
enabled: yes
masked: no
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
- name: start avahi-linker
systemd:
name: avahi-linker
state: started
enabled: yes
masked: no
Enable and start additional services after the avahi-linker installation
2017-07-16 08:29:13 +02:00
- name: enable and start additional services for avahi-linker
systemd:
name: '{{ item }}'
state: started
enabled: yes
masked: no
with_items:
- vdr-net-monitor
- vdr-update-monitor
- prevent-umount-on-pause
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
#+END_SRC
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
** nfs-server
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
*** TODO avahi-services für NFS beim Stoppen des nfs-kernel-servers depublizieren, beim Start wieder announcen
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/nfs-server/tasks/main.yml :mkdirp yes :padline no
---
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
- name: install nfs server packages
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
apt:
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
name: '{{ item }}'
state: present
install_recommends: no
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
with_items:
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
- nfs-kernel-server
- nfs-common
- name: create /etc/exports
template:
src: templates/nfs-exports.j2
dest: /etc/exports
notify: [ 'Restart NFS Kernel Server' ]
Fix indentation for /etc/exports template
2017-06-22 12:09:49 +02:00
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
- name: populate /etc/avahi/services
template:
src: templates/avahi/service.j2
dest: '/etc/avahi/services/yavdr-{{ item.key }}.service'
with_dict: '{{ media_dirs }}'
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
#+END_SRC
*** templates
Fix indentation for /etc/exports template
2017-06-22 12:09:49 +02:00
**** /etc/exports
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC conf :tangle roles/nfs-server/templates/nfs-exports.j2 :mkdirp yes :padline no
Fix indentation for /etc/exports template
2017-06-22 12:09:49 +02:00
/srv *(rw,fsid=0,sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }})
{% for name, path in media_dirs.iteritems() %}
{{ path }} *(rw,fsid={{ loop.index }},sync,no_subtree_check,all_squash,anongid={{ vdr.gid }},anonuid={{ vdr.uid }}{{ ',insecure' if nfs.insecure else '' }})
{% endfor %}
#+END_SRC
**** avahi services
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
#+BEGIN_SRC xml :tangle roles/nfs-server/templates/avahi/service.j2 :mkdirp yes :padline no
Fix indentation for /etc/exports template
2017-06-22 12:09:49 +02:00
<?xml version="1.0" standalone='no'?>
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
<name replace-wildcards="yes">{{ item.key|capitalize }} on %h</name> ## Name
Fix indentation for /etc/exports template
2017-06-22 12:09:49 +02:00
<service>
<type>_nfs._tcp</type>
<port>2049</port>
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
<txt-record>path={{ item.value }}</txt-record> ## path to shared Folder
<txt-record>subtype={{ 'vdr' if item.key == 'recordings' else item.key }}</txt-record> ## subtype
Fix indentation for /etc/exports template
2017-06-22 12:09:49 +02:00
</service>
</service-group>
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
#+END_SRC
Special configuration for openbox on second display do not focus new windows
2018-08-05 13:57:19 +02:00
Update xorg.conf template for dual screen
2017-07-16 09:58:23 +02:00
** STARTED yavdr-remote
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** default variables
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-remote/defaults/main.yml :mkdirp yes :padline no
lircd0_socket: /var/run/lirc/lircd0
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-remote/tasks/main.yml :mkdirp yes :padline no
more formatting corrections, add yavdr-remote role
2017-06-20 16:20:24 +02:00
---
# This role is used to set up the yaVDR remote control configuration.
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
- name: apt | install packages for remote support
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
apt:
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
name: '{{ item }}'
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
state: present
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
with_items:
- yavdr-remote
- lirc
tags:
- packages
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
- name: add systemd drop-in for lircd to use lircd2uinput
block:
- name: create directory /etc/systemd/system/lircd.service.d/
file:
path: /etc/systemd/system/lircd.service.d/
state: directory
- name: expand template for /etc/systemd/system/lircd.service.d/lircd2uinput.conf
template:
src: templates/lircd.service.d/lircd2uinput.conf.j2
dest: /etc/systemd/system/lircd.service.d/lircd2uinput.conf
tags:
- config
more formatting corrections, add yavdr-remote role
2017-06-20 16:20:24 +02:00
disable lircmd.service
2018-01-18 09:35:32 +01:00
- name: stop, mask and disable lircd.socket, lircd.service, lircmd.service and lircd-uinput.service # (the default lirc configuration conflicts with eventlircd)
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
systemd:
name: '{{ item }}'
enabled: no
state: stopped
masked: yes
with_items:
- lircd.service
- lircd.socket
disable lircmd.service
2018-01-18 09:35:32 +01:00
- lircmd.service
Disable lircd-uinput.service
2017-07-16 10:17:08 +02:00
- lircd-uinput.service
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
ignore_errors: yes
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
tags:
- systemd
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Install lircd2uinput after eventlircd
2018-05-06 19:26:04 +02:00
- name: apt | install eventlircd and lircd2uinput
Install eventlircd after lircd has been stopped
2018-05-06 16:32:39 +02:00
apt:
name: '{{ item }}'
state: present
with_items:
- eventlircd
Install lircd2uinput after eventlircd
2018-05-06 19:26:04 +02:00
- lircd2uinput
Install eventlircd after lircd has been stopped
2018-05-06 16:32:39 +02:00
tags:
- packages
Let yavdr-remote always install eventlircd, activate lircd for vdr
2017-07-16 09:17:39 +02:00
- name: configure vdr to read from a lircd-compatible socket
template:
src: templates/03-vdr-lirc.conf.j2
dest: /etc/vdr/conf.d/03-vdr-lirc.conf
Fix typo
2017-07-16 09:21:35 +02:00
notify: ['Restart VDR']
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
tags:
- config
Let yavdr-remote always install eventlircd, activate lircd for vdr
2017-07-16 09:17:39 +02:00
Add template for /etc/rc_maps.cfg
2017-12-19 12:32:37 +01:00
- name: expand template for /etc/rc_maps.cfg
template:
src: templates/rc_maps.cfg.j2
dest: /etc/rc_maps.cfg
notify: ['Trigger Udev']
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
tags:
- config
more formatting corrections, add yavdr-remote role
2017-06-20 16:20:24 +02:00
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** templates
Add template for /etc/rc_maps.cfg
2017-12-19 12:32:37 +01:00
**** Systemd Drop-in to start vdr with lirc support
Add template for vdr lirc configuration
2017-07-16 09:34:03 +02:00
#+BEGIN_SRC conf :tangle roles/yavdr-remote/templates/03-vdr-lirc.conf.j2 :mkdirp yes :padline no
Do not set vdr lirc socket if frontend is set to "kodi"
2017-07-16 09:27:04 +02:00
{% if frontend != 'kodi' %}
Let yavdr-remote always install eventlircd, activate lircd for vdr
2017-07-16 09:17:39 +02:00
[vdr]
--lirc=/var/run/lirc/lircd
Do not set vdr lirc socket if frontend is set to "kodi"
2017-07-16 09:27:04 +02:00
{% endif %}
Let yavdr-remote always install eventlircd, activate lircd for vdr
2017-07-16 09:17:39 +02:00
#+END_SRC
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
**** Systemd Drop-in to start lircd2uinput with lircd
#+BEGIN_SRC conf :tangle roles/yavdr-remote/templates/lircd.service.d/lircd2uinput.conf.j2 :mkdirp yes :padline no
[Service]
call lircd2uinput-add after lircd has been started
2018-01-01 23:41:03 +01:00
ExecStartPost=/usr/bin/lircd2uinput-add /var/run/lirc/lircd0
Fix systemd drop-in ExecStopCommand
2018-01-01 23:27:47 +01:00
ExecStopPost=/usr/bin/lircd2uinput-remove /var/run/lirc/lircd0
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
#+END_SRC
Add template for /etc/rc_maps.cfg
2017-12-19 12:32:37 +01:00
**** create /etc/rc_maps.cfg
#+BEGIN_SRC conf :tangle roles/yavdr-remote/templates/rc_maps.cfg.j2 :mkdirp yes :padline no
Merge branch 'bionic' of https://github.com/yavdr/yavdr-ansible into bionic and reflect change in Manual.org
2018-08-02 10:04:27 +02:00
{{ ansible_managed | comment }}
Add template for /etc/rc_maps.cfg
2017-12-19 12:32:37 +01:00
#
# Keymaps table
#
# This table creates an association between a keycode file and a kernel
# driver. It can be used to automatically override a keycode definition.
#
# Although not yet tested, it is mented to be added at udev.
#
# To use, you just need to run:
# ./ir-keytable -a
#
# Or, if the remote is not the first device:
# ./ir-keytable -a -s rc1 # for RC at rc1
#
# Format:
# driver - name of the driver provided via uevent - use * for any driver
# table - RC keymap table, provided via uevent - use * for any table
# file - file name. If directory is not specified, it will default to
# /etc/rc_keymaps.
# For example:
# driver table file
# cx8800 * ./keycodes/rc5_hauppauge_new
# * rc-avermedia-m135a-rm-jx ./keycodes/kworld_315u
# saa7134 rc-avermedia-m135a-rm-jx ./keycodes/keycodes/nec_terratec_cinergy_xs
# em28xx * ./keycodes/kworld_315u
# * * ./keycodes/rc5_hauppauge_new
# Table to automatically load the rc maps for the bundled IR's provided with the
# devices supported by the linux kernel
#driver table file
,* rc-adstech-dvb-t-pci adstech_dvb_t_pci
,* rc-alink-dtu-m alink_dtu_m
,* rc-anysee anysee
,* rc-apac-viewcomp apac_viewcomp
,* rc-asus-pc39 asus_pc39
,* rc-asus-ps3-100 asus_ps3_100
,* rc-ati-tv-wonder-hd-600 ati_tv_wonder_hd_600
,* rc-ati-x10 ati_x10
,* rc-avermedia-a16d avermedia_a16d
,* rc-avermedia-cardbus avermedia_cardbus
,* rc-avermedia-dvbt avermedia_dvbt
,* rc-avermedia-m135a avermedia_m135a
,* rc-avermedia-m733a-rm-k6 avermedia_m733a_rm_k6
,* rc-avermedia-rm-ks avermedia_rm_ks
,* rc-avermedia avermedia
,* rc-avertv-303 avertv_303
,* rc-azurewave-ad-tu700 azurewave_ad_tu700
,* rc-behold-columbus behold_columbus
,* rc-behold behold
,* rc-budget-ci-old budget_ci_old
,* rc-cec cec
,* rc-cinergy-1400 cinergy_1400
,* rc-cinergy cinergy
,* rc-delock-61959 delock_61959
,* rc-dib0700-nec dib0700_nec
,* rc-dib0700-rc5 dib0700_rc5
,* rc-digitalnow-tinytwin digitalnow_tinytwin
,* rc-digittrade digittrade
,* rc-dm1105-nec dm1105_nec
,* rc-dntv-live-dvb-t dntv_live_dvb_t
,* rc-dntv-live-dvbt-pro dntv_live_dvbt_pro
,* rc-dtt200u dtt200u
,* rc-dvbsky dvbsky
,* rc-em-terratec em_terratec
,* rc-encore-enltv-fm53 encore_enltv_fm53
,* rc-encore-enltv encore_enltv
,* rc-encore-enltv2 encore_enltv2
,* rc-evga-indtube evga_indtube
,* rc-eztv eztv
,* rc-flydvb flydvb
,* rc-flyvideo flyvideo
,* rc-fusionhdtv-mce fusionhdtv_mce
,* rc-gadmei-rm008z gadmei_rm008z
,* rc-genius-tvgo-a11mce genius_tvgo_a11mce
,* rc-gotview7135 gotview7135
,* rc-hauppauge hauppauge
#* rc-imon-mce imon_mce
#* rc-imon-pad imon_pad
,* rc-iodata-bctv7e iodata_bctv7e
,* rc-it913x-v1 it913x_v1
,* rc-it913x-v2 it913x_v2
,* rc-kaiomy kaiomy
,* rc-kworld-315u kworld_315u
,* rc-kworld-pc150u kworld_pc150u
,* rc-kworld-plus-tv-analog kworld_plus_tv_analog
,* rc-leadtek-y04g0051 leadtek_y04g0051
,* rc-lme2510 lme2510
,* rc-manli manli
,* rc-medion-x10-digitainer medion_x10_digitainer
,* rc-medion-x10-or2x medion_x10_or2x
,* rc-medion-x10 medion_x10
,* rc-msi-digivox-ii msi_digivox_ii
,* rc-msi-digivox-iii msi_digivox_iii
,* rc-msi-tvanywhere-plus msi_tvanywhere_plus
,* rc-msi-tvanywhere msi_tvanywhere
,* rc-nebula nebula
,* rc-nec-terratec-cinergy-xs nec_terratec_cinergy_xs
,* rc-norwood norwood
,* rc-npgtech npgtech
,* rc-pctv-sedna pctv_sedna
,* rc-pinnacle-color pinnacle_color
,* rc-pinnacle-grey pinnacle_grey
,* rc-pinnacle-pctv-hd pinnacle_pctv_hd
,* rc-pixelview-002t pixelview_002t
,* rc-pixelview-mk12 pixelview_mk12
,* rc-pixelview-new pixelview_new
,* rc-pixelview pixelview
,* rc-powercolor-real-angel powercolor_real_angel
,* rc-proteus-2309 proteus_2309
,* rc-purpletv purpletv
,* rc-pv951 pv951
,* rc-real-audio-220-32-keys real_audio_220_32_keys
,* rc-reddo reddo
,* rc-snapstream-firefly snapstream_firefly
,* rc-streamzap streamzap
,* rc-su3000 su3000
,* rc-tbs-nec tbs_nec
,* rc-technisat-ts35 technisat_ts35
,* rc-technisat-usb2 technisat_usb2
,* rc-terratec-cinergy-c-pci terratec_cinergy_c_pci
,* rc-terratec-cinergy-s2-hd terratec_cinergy_s2_hd
,* rc-terratec-cinergy-xs terratec_cinergy_xs
,* rc-terratec-slim-2 terratec_slim_2
,* rc-terratec-slim terratec_slim
,* rc-tevii-nec tevii_nec
,* rc-tivo tivo
,* rc-total-media-in-hand-02 total_media_in_hand_02
,* rc-total-media-in-hand total_media_in_hand
,* rc-trekstor trekstor
,* rc-tt-1500 tt_1500
,* rc-twinhan-dtv-cab-ci twinhan_dtv_cab_ci
,* rc-twinhan1027 twinhan_vp1027_dvbs
,* rc-videomate-k100 videomate_k100
,* rc-videomate-s350 videomate_s350
,* rc-videomate-tv-pvr videomate_tv_pvr
,* rc-winfast-usbii-deluxe winfast_usbii_deluxe
,* rc-winfast winfast
# * * a800 # found in a800.c
# * * af9005 # found in af9005-remote.c
# * * cinergyt2 # found in cinergyT2-core.c
# * * dvico_mce # found in cxusb.c
# * * dvico_portable # found in cxusb.c
# * * d680_dmb # found in cxusb.c
# * * dibusb # found in dibusb-common.c
# * * digitv # found in digitv.c
# * * megasky # found in m920x.c
# * * tvwalkerir-kbd-i2c rc-hauppauge /lib/udev/rc_keymaps/rc-hauppaugetwin # found in m920x.c
# * * pinnacle310e # found in m920x.c
# * * haupp # found in nova-t-usb2.c
# * * opera1 # found in opera1.c
# * * vp702x # found in vp702x.c
# * * vp7045 # found in vp7045.c
# Hauppauge PVR 350
ir-kbd-i2c rc-hauppauge /lib/udev/rc_keymaps/rc-hauppauge
# imon-pad
imon rc-imon-pad /lib/udev/rc_keymaps/rc-imon-pad
imon rc-imon-mce /lib/udev/rc_keymaps/rc-imon-mce
# TT-1500/1501
,* rc-tt-1500 /lib/udev/rc_keymaps/rc-tt-1500
budget_ci rc-tt-1500 /lib/udev/rc_keymaps/rc-tt-1501
# rc-rc6-mce
,* rc-rc6-mce /lib/udev/rc_keymaps/rc-rc6-mce
# CIR
ite-cir rc-rc6-mce /lib/udev/rc_keymaps/rc-rc6-mce
nuvoton-cir rc-rc6-mce /lib/udev/rc_keymaps/rc-rc6-mce
# mceusb
mceusb rc-rc6-mce /lib/udev/rc_keymaps/HOPLOrc6
# Skystarhd2
mantis_core * /lib/udev/rc_keymaps/skystarhd2
# Medion X10
ati_remote rc-medion-x10 /lib/udev/rc_keymaps/rc-medion-x10
ati_remote rc-medion-x10-or2x /lib/udev/rc_keymaps/rc-medion-x10-or2x
ati_remote rc-medion-x10-digitainer /lib/udev/rc_keymaps/rc-medion-x10-digitainer
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** files
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
add pulseaudio role
2017-06-22 12:10:23 +02:00
** pulseaudio
*** tasks
#+BEGIN_SRC yaml :tangle roles/pulseaudio/tasks/main.yml :mkdirp yes :padline no
---
Fix plugin name and typo
2017-12-17 11:37:28 +01:00
- name: apt | install pulseaudio, pavucontrol and vdr-plugin-pulsecontrol
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
apt:
add pulseaudio role
2017-06-22 12:10:23 +02:00
name: '{{ item }}'
state: present
install_recommends: no
with_items:
- pulseaudio
- pavucontrol
Fix plugin name and typo
2017-12-17 11:37:28 +01:00
- vdr-plugin-pulsecontrol
add pulseaudio role
2017-06-22 12:10:23 +02:00
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- name: create /etc/asound.conf with pulseaudio as default device
add pulseaudio role
2017-06-22 12:10:23 +02:00
template:
src: templates/alsa/asound.conf.j2
dest: /etc/asound.conf
#+END_SRC
*** templates
#+BEGIN_SRC conf :tangle roles/pulseaudio/templates/alsa/asound.conf.j2 :mkdirp yes :padline no
# Use PulseAudio by default
pcm.!default {
type pulse
fallback "sysdefault"
hint {
show on
description "Default ALSA Output (currently PulseAudio Sound Server)"
}
}
ctl.!default {
type pulse
fallback "sysdefault"
}
#+END_SRC
Special configuration for openbox on second display do not focus new windows
2018-08-05 13:57:19 +02:00
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
** yavdr-xorg
Add explanatory section to yavdr-xorg
2017-08-01 10:40:53 +02:00
*** About the GUI session
Use yavdr-xorg to control xlogin@vdr.service and x@vt7.service
2018-04-24 09:56:29 +02:00
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.
Add explanatory section to yavdr-xorg
2017-08-01 10:40:53 +02:00
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
~x@vt7.service~ is started automatically as a dependency of ~xlogin@vdr.service~ and starts the X-server. ~xlogin@vdr.service~ also starts a systemd user session using ~user@666.service~.
Add space
2017-12-17 14:37:03 +01:00
In order to use the keyboard layout configured during installation for the X-Server the script ~write-x11-keyboard-config~ reads the keyboard configuration from ~/etc/default/keyboard~ when starting ~x@.service~ and writes the file ~/etc/X11/xorg.conf.d/00-keyboard.conf~ (because systemd for Ubuntu (and Debian) has been patched not to create ~/etc/X11/xorg.conf.d/00-keyboard.conf~ according to the ~localectl~ settings).
Add explanatory section to yavdr-xorg
2017-08-01 10:40:53 +02:00
To prevent stopping the X-server when vdr is running, additional dependencies are set up - see the drop-in rules created in ~/etc/systemd/system/vdr.service.d/~.
Basic Services like the session DBus, pulseaudio etc. are started for the ~default.target~ of the session.
The openbox autostart script is used to update the systemd session with the needed session variables. It creates a file =~/.session-env= which is used as an environment file by ~vdr.service~ (so the vdr knows the *DISPLAY* and can access pulseaudio).
The autostart script then enables all services to be pulled in by yavdr-desktop.target. As the last step ~yavdr-desktop.target~ is startet, which results in staring ~yavdr-frontend.service~ and additional Units for a second display (openbox and a browser for osd2eb, if available).
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
# TODO: describe yavdr-frontend
In order to achive a clean shutdown of the session, ~x@t7.service~ is set as a dependency of the systemd unit instance ~user@666.service~ and all processes within the session must be shutdown properly when stopping ~xlogin@vdr.service~. If systemd units are used within the user session, they must stop their process(es) successfully (you should set them up to accept expected exit codes appropriately). The window manager /openbox/ is started using the =~/.xinitrc= and stopped using the systemd unit ~exit-wm.service~ (which runs on stopping the jobs pulled in by the ~default.target~ of the session).
*** TODO automatic X-server configuration :noexport:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- [X] detect connected display
- [X] read EDID from displays
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
create a xorg.conf for
- [X] nvidia
- [ ] intel
- [ ] amd gpus
Create drop-in for sudo for vdr user this allows to restart vdr.service and reboot the system
2018-05-23 09:55:57 +02:00
- [ ] allow overscan compensation in xorg.conf or via xrandr on startup
Update Manual.org
2017-02-28 17:40:04 +01:00
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
**** HOLD Nvidia-GPUs:read EDID:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
#+BEGIN_SRC shell
$ nvidia-xconfig --extract-edids-from-file=/var/log/Xorg.0.log --extract-edids-output-file=/tmp/edid.bin.0
Found 2 EDIDs in "/var/log/Xorg.0.log".
Wrote EDID for "DELL 2407WFP (CRT-1)" to "/tmp/edid.bin.0.0" (128 bytes).
Wrote EDID for "ADI A715 (DFP-1)" to "/tmp/edid.bin.0.1" (128 bytes).
$ xrandr -q
Screen 0: minimum 8 x 8, current 3200 x 1200, maximum 8192 x 8192
DVI-I-0 disconnected primary (normal left inverted right x axis y axis)
VGA-0 connected 1920x1200+1280+0 (normal left inverted right x axis y axis) 519mm x 324mm
1920x1200 59.95*+
1680x1050 59.95
1280x1024 75.02 60.02
1152x864 75.00
1024x768 75.03 60.00
800x600 75.00 60.32
640x480 75.00 59.94
DVI-I-1 disconnected (normal left inverted right x axis y axis)
HDMI-0 connected 1280x1024+0+0 (normal left inverted right x axis y axis) 338mm x 270mm
1280x1024 60.02*+
1024x768 60.00
800x600 60.32
640x480 59.95 59.94
$ parse-edid < /tmp/edid.bin.0.1
Checksum Correct
Section "Monitor"
Identifier "ADI A715"
ModelName "ADI A715"
VendorName "ADI"
# Monitor Manufactured week 15 of 2003
# EDID version 1.3
# Digital Display
DisplaySize 330 270
Gamma 2.20
Option "DPMS" "true"
#Not giving standard mode: 640x480, 60Hz
#Not giving standard mode: 800x600, 60Hz
#Not giving standard mode: 1024x768, 60Hz
#Not giving standard mode: 1280x1024, 60Hz
Modeline "Mode 0" 108.00 1280 1328 1440 1688 1024 1025 1028 1066 +hsync +vsync
Modeline "Mode 1" 40.00 800 840 968 1056 600 601 605 628 +hsync +vsync
EndSection
$ parse-edid < /tmp/edid.bin.0.0
Checksum Correct
Section "Monitor"
Identifier "DELL 2407WFP"
ModelName "DELL 2407WFP"
VendorName "DEL"
# Monitor Manufactured week 24 of 2007
# EDID version 1.3
# Analog Display
Option "SyncOnGreen" "true"
DisplaySize 520 330
Gamma 2.20
Option "DPMS" "true"
Horizsync 30-83
VertRefresh 56-76
# Maximum pixel clock is 170MHz
#Not giving standard mode: 1280x1024, 60Hz
#Not giving standard mode: 1600x1200, 60Hz
#Not giving standard mode: 1152x864, 75Hz
#Not giving standard mode: 1680x1050, 60Hz
Modeline "Mode 0" 154.00 1920 1968 2000 2080 1200 1203 1209 1235 +hsync -vsync
EndSection
#+END_SRC
Do not export two sections
2017-11-09 09:52:00 +01:00
**** DONE Start X-server with debug-output :noexport:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
#+BEGIN_SRC conf
# /etc/systemd/system/x-debug@.service
Update Manual.org
2017-02-28 17:40:04 +01:00
[Unit]
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
Description=X with verbose logging on %I
Wants=graphical.target
Before=graphical.target
Conflicts=xlogin@vdr.service x@vt7.service
[Service]
Type=forking
ExecStart=/usr/bin/x-daemon -logverbose 6 -noreset %I -config xdiscover.conf
Update Manual.org
2017-02-28 17:40:04 +01:00
#+END_SRC
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
#+BEGIN_SRC conf
# /etc/X11/xdiscover.conf
Section "Device"
Identifier "nvidia"
Driver "nvidia"
Option "NoLogo" "true"
Option "DynamicTwinView" "true"
Option "NoFlip" "false"
# Option "FlatPanelProperties" "Scaling = Native"
# Option "ModeValidation" "NoVesaModes, NoXServerModes"
# Option "ModeDebug" "true"
# Option "HWCursor" "false"
EndSection
Section "Screen"
Identifier "screen"
Device "nvidia"
EndSection
Section "Extensions"
Option "Composite" "false"
EndSection
Update Manual.org
2017-02-28 17:40:04 +01:00
#+END_SRC
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
**** DONE python-script for parsing xrandr --verbose output
***** Example output
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
# ION-330-I
#+BEGIN_SRC shell :tangle library/xrandr_output.1
$ xrandr --verbose
Screen 0: minimum 8 x 8, current 1280 x 720, maximum 8192 x 8192
VGA-0 disconnected primary (normal left inverted right x axis y axis)
Identifier: 0x1c4
Timestamp: 18571
Subpixel: unknown
Clones:
CRTCs: 0 1
Transform: 1.000000 0.000000 0.000000
0.000000 1.000000 0.000000
0.000000 0.000000 1.000000
filter:
BorderDimensions: 4
supported: 4
Border: 0 0 0 0
range: (0, 65535)
SignalFormat: VGA
supported: VGA
ConnectorType: VGA
ConnectorNumber: 0
_ConnectorLocation: 1
HDMI-0 connected 1280x720+0+0 (0x1cb) normal (normal left inverted right x axis y axis) 885mm x 498mm
Identifier: 0x1c5
Timestamp: 18571
Subpixel: unknown
Gamma: 1.0:1.0:1.0
Brightness: 1.0
Clones:
CRTC: 0
CRTCs: 0 1fg
Transform: 1.000000 0.000000 0.000000
0.000000 1.000000 0.000000
0.000000 0.000000 1.000000
filter:
EDID:
00ffffffffffff004c2d800100000000
2c0e01038059328c0ae2bda15b4a9824
15474a20000001010101010101010101
010101010101011d007251d01e206e28
550075f23100001e011d00bc52d01e20
b828554075f23100001e000000fd0032
3d0f2e08000a202020202020000000fc
0053414d53554e470a20202020200181
02031971468413051403122309070783
01000065030c001000011d8018711c16
20582c250075f23100009e011d80d072
1c1620102c258075f23100009e8c0ad0
8a20e02d10103e960075f2310000188c
0ad090204031200c40550075f2310000
18000000000000000000000000000000
000000000000000000000000000000ca
BorderDimensions: 4
supported: 4
Border: 39 24 41 21
range: (0, 65535)
SignalFormat: TMDS
supported: TMDS
ConnectorType: HDMI
ConnectorNumber: 1
_ConnectorLocation: 2
1280x720 (0x1c6) 74.2MHz +HSync +VSync +preferred
h: width 1280 start 1390 end 1430 total 1650 skew 0 clock 45.0KHz
v: height 720 start 725 end 730 total 750 clock 60.0Hz
1920x1080 (0x1c7) 74.2MHz +HSync +VSync Interlace
h: width 1920 start 2008 e#nd 2052 total 2200 skew 0 clock 33.8KHz
v: height 1080 start 1084 end 1094 total 1124 clock 60.1Hz
1920x1080 (0x1c8) 74.2MHz +HSync +VSync Interlace
h: width 1920 start 2008 end 2052 total 2200 skew 0 clock 33.7KHz
v: height 1080 start 1084 end 1094 total 1124 clock 60.0Hz
1920x1080 (0x1c9) 74.2MHz +HSync +VSync Interlace
h: width 1920 start 2448 end 2492 total 2640 skew 0 clock 28.1KHz
v: height 1080 start 1084 end 1094 total 1124 clock 50.0Hz
1280x720 (0x1ca) 74.2MHz +HSync +VSync
h: width 1280 start 1390 end 1430 total 1650 skew 0 clock 45.0KHz
v: height 720 start 725 end 730 total 750 clock 59.9Hz
1280x720 (0x1cb) 74.2MHz +HSync +VSync *current
h: width 1280 start 1720 end 1760 total 1980 skew 0 clock 37.5KHz
v: height 720 start 725 end 730 total 750 clock 50.0Hz
800x600 (0x1cc) 40.0MHz +HSync +VSync
h: width 800 start 840 end 968 total 1056 skew 0 clock 37.9KHz
v: height 600 start 601 end 605 total 628 clock 60.3Hz
800x600 (0x1cd) 36.0MHz +HSync +VSync
h: width 800 start 824 end 896 total 1024 skew 0 clock 35.2KHz
v: height 600 start 601 end 603 total 625 clock 56.2Hz
720x576 (0x1ce) 27.0MHz -HSync -VSync
h: width 720 start 732 end 796 total 864 skew 0 clock 31.2KHz
v: height 576 start 581 end 586 total 625 clock 50.0Hz
720x480 (0x1cf) 27.0MHz -HSync -VSync
h: width 720 start 736 end 798 total 858 skew 0 clock 31.5KHz
v: height 480 start 489 end 495 total 525 clock 59.9Hz
640x480 (0x1d0) 25.2MHz -HSync -VSync
h: width 640 start 656 end 752 total 800 skew 0 clock 31.5KHz
v: height 480 start 490 end 492 total 525 clock 59.9Hz
320x240 (0x1d1) 12.6MHz -HSync -VSync DoubleScan
h: width 320 start 328 end 376 total 400 skew 0 clock 31.5KHz
v: height 240 start 245 end 246 total 262 clock 60.1Hz
#+END_SRC
# GT210
#+BEGIN_SRC shell :tangle library/xrandr_output.2
$ xrandr --verbose
Screen 0: minimum 8 x 8, current 3200 x 1200, maximum 8192 x 8192
DVI-I-0 disconnected primary (normal left inverted right x axis y axis)
Identifier: 0x1c4
Timestamp: 641679
Subpixel: unknown
Clones:
CRTCs: 0 1
Transform: 1.000000 0.000000 0.000000
0.000000 1.000000 0.000000
0.000000 0.000000 1.000000
filter:
BorderDimensions: 4
supported: 4
Border: 0 0 0 0
range: (0, 65535)
SignalFormat: VGA
supported: VGA
ConnectorType: DVI-I
ConnectorNumber: 0
_ConnectorLocation: 0
VGA-0 connected 1920x1200+1280+0 (0x1c6) normal (normal left inverted right x axis y axis) 519mm x 324mm
Identifier: 0x1c5
Timestamp: 641679
Subpixel: unknown
Gamma: 1.0:1.0:1.0
Brightness: 1.0
Clones:
CRTC: 1
CRTCs: 0 1
Transform: 1.000000 0.000000 0.000000
0.000000 1.000000 0.000000
0.000000 0.000000 1.000000
filter:
EDID:
00ffffffffffff0010ac16a0534b4431
181101030e342178eeee91a3544c9926
0f5054a54b008180a940714fb3000101
010101010101283c80a070b023403020
360007442100001a000000ff00555935
343537364531444b5320000000fc0044
454c4c20323430375746500a000000fd
00384c1e5311000a20202020202000f1
BorderDimensions: 4
supported: 4
Border: 0 0 0 0
range: (0, 65535)
SignalFormat: VGA
supported: VGA
ConnectorType: VGA
ConnectorNumber: 2
_ConnectorLocation: 2
1920x1200 (0x1c6) 154.000MHz +HSync -VSync *current +preferred
h: width 1920 start 1968 end 2000 total 2080 skew 0 clock 74.04KHz
v: height 1200 start 1203 end 1209 total 1235 clock 59.95Hz
1680x1050 (0x1c7) 146.250MHz -HSync +VSync
h: width 1680 start 1784 end 1960 total 2240 skew 0 clock 65.29KHz
v: height 1050 start 1053 end 1059 total 1089 clock 59.95Hz
1280x1024 (0x1c8) 135.000MHz +HSync +VSync
h: width 1280 start 1296 end 1440 total 1688 skew 0 clock 79.98KHz
v: height 1024 start 1025 end 1028 total 1066 clock 75.02Hz
1280x1024 (0x1c9) 108.000MHz +HSync +VSync
h: width 1280 start 1328 end 1440 total 1688 skew 0 clock 63.98KHz
v: height 1024 start 1025 end 1028 total 1066 clock 60.02Hz
1152x864 (0x1ca) 108.000MHz +HSync +VSync
h: width 1152 start 1216 end 1344 total 1600 skew 0 clock 67.50KHz
v: height 864 start 865 end 868 total 900 clock 75.00Hz
1024x768 (0x1cb) 78.750MHz +HSync +VSync
h: width 1024 start 1040 end 1136 total 1312 skew 0 clock 60.02KHz
v: height 768 start 769 end 772 total 800 clock 75.03Hz
1024x768 (0x1cc) 65.000MHz -HSync -VSync
h: width 1024 start 1048 end 1184 total 1344 skew 0 clock 48.36KHz
v: height 768 start 771 end 777 total 806 clock 60.00Hz
800x600 (0x1cd) 49.500MHz +HSync +VSync
h: width 800 start 816 end 896 total 1056 skew 0 clock 46.88KHz
v: height 600 start 601 end 604 total 625 clock 75.00Hz
800x600 (0x1ce) 40.000MHz +HSync +VSync
h: width 800 start 840 end 968 total 1056 skew 0 clock 37.88KHz
v: height 600 start 601 end 605 total 628 clock 60.32Hz
640x480 (0x1cf) 31.500MHz -HSync -VSync
h: width 640 start 656 end 720 total 840 skew 0 clock 37.50KHz
v: height 480 start 481 end 484 total 500 clock 75.00Hz
640x480 (0x1d0) 25.175MHz -HSync -VSync
h: width 640 start 656 end 752 total 800 skew 0 clock 31.47KHz
v: height 480 start 490 end 492 total 525 clock 59.94Hz
DVI-I-1 disconnected (normal left inverted right x axis y axis)
Identifier: 0x1d1
Timestamp: 641679
Subpixel: unknown
Clones:
CRTCs: 0 1
Transform: 1.000000 0.000000 0.000000
0.000000 1.000000 0.000000
0.000000 0.000000 1.000000
filter:
BorderDimensions: 4
supported: 4
Border: 0 0 0 0
range: (0, 65535)
SignalFormat: TMDS
supported: TMDS
ConnectorType: DVI-I
ConnectorNumber: 0
_ConnectorLocation: 0
HDMI-0 connected 1280x1024+0+0 (0x1c9) normal (normal left inverted right x axis y axis) 338mm x 270mm
Identifier: 0x1d2
Timestamp: 641679
Subpixel: unknown
Gamma: 1.0:1.0:1.0
Brightness: 1.0
Clones:
CRTC: 0
CRTCs: 0 1
Transform: 1.000000 0.000000 0.000000
0.000000 1.000000 0.000000
0.000000 0.000000 1.000000
filter:
EDID:
00ffffffffffff0004895d2320090000
0f0d0103e0211b782ac5c6a3574a9c23
124f5421080031404540614081800101
010101010101302a009851002a403070
1300520e1100001ea00f200031581c20
28801400520e1100001e000000ff0033
31355430324530323333360a000000fc
0041444920413731350a20202020002b
BorderDimensions: 4
supported: 4
Border: 0 0 0 0
range: (0, 65535)
SignalFormat: TMDS
supported: TMDS
ConnectorType: HDMI
ConnectorNumber: 1
_ConnectorLocation: 1
1280x1024 (0x1c9) 108.000MHz +HSync +VSync *current +preferred
h: width 1280 start 1328 end 1440 total 1688 skew 0 clock 63.98KHz
v: height 1024 start 1025 end 1028 total 1066 clock 60.02Hz
1024x768 (0x1cc) 65.000MHz -HSync -VSync
h: width 1024 start 1048 end 1184 total 1344 skew 0 clock 48.36KHz
v: height 768 start 771 end 777 total 806 clock 60.00Hz
800x600 (0x1ce) 40.000MHz +HSync +VSync
h: width 800 start 840 end 968 total 1056 skew 0 clock 37.88KHz
v: height 600 start 601 end 605 total 628 clock 60.32Hz
640x480 (0x1d3) 25.180MHz -HSync -VSync
h: width 640 start 648 end 744 total 800 skew 0 clock 31.48KHz
v: height 480 start 482 end 484 total 525 clock 59.95Hz
640x480 (0x1d0) 25.175MHz -HSync -VSync
h: width 640 start 656 end 752 total 800 skew 0 clock 31.47KHz
v: height 480 start 490 end 492 total 525 clock 59.94Hz
#+END_SRC
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
***** parse hex-strings
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
#+BEGIN_SRC python
>>> import binascii
>>> s = "deadbeef"
>>> binascii.a2b_hex(s)
b'\xde\xad\xbe\xef'
Update Manual.org
2017-02-28 17:40:04 +01:00
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** default variables
Change from tag to variable first_run
2018-01-07 18:45:01 +01:00
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/defaults/main.yml :mkdirp yes :padline no
Fix case of boolean variable
2018-01-07 19:00:27 +01:00
first_run: False
Allow overriding preferred refresh rate, resolution and connection for xrandr_facts module. You can set own preferences e.g. in a host_vars/localhost.yml using the variables preferred_refreshrates, preferred_resolutions and preferred_outputs (see roles/yavdr-xorg/default/main.yml for default values).
2018-05-10 22:04:45 +02:00
preferred_outputs:
- HDMI
- DP
- DVI
- VGA
- TV
preferred_resolutions:
- 7680x4320
- 3840x2160
- 1920x1080
- 1280x720
- 720x576
preferred_refreshrates:
- 50
- 60
Change from tag to variable first_run
2018-01-07 18:45:01 +01:00
#+END_SRC
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
*** tasks
Add irexec.service for the user session
2017-12-20 10:43:15 +01:00
**** main.yml
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/main.yml :mkdirp yes :padline no
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
---
# file: roles/yavdr-xorg/tasks/main.yml
Use correct syntax for tag-controlled imports now it is possible to run just the tasks with the xorg.detect tag: sudo -H ansible-playbook -i "localhost," --tags="xorg.detect" --connection=local yavdr07.yml
2018-01-07 17:46:55 +01:00
- import_tasks: setup-xorg.yml
tags: [install,update]
- import_tasks: detect-xorg.yml
tags: [xorg.detect,install]
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
#+END_SRC
Add irexec.service for the user session
2017-12-20 10:43:15 +01:00
**** setup-xorg.yml
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/setup-xorg.yml :mkdirp yes :padline no
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
---
# file: roles/yavdr-xorg/tasks/setup-xorg.yml
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
- name: create directories for systemd drop-in files
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
file:
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
dest: '{{ item }}'
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
state: directory
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
with_items:
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- "/etc/systemd/system/x@.service.d/"
- "/etc/systemd/system/vdr.service.d/"
- "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
Set X11 keyboard configuration according to /etc/default/keyboard values
2017-12-17 10:38:12 +01:00
- "/etc/X11/xorg.conf.d/"
remove colon from name variables, fix org syntax error
2017-11-22 08:11:56 +01:00
- name: systemd-drop-in | add dependency to X-server for vdr.service
Rearrange tasks in yavdr-xorg
2017-07-16 11:05:54 +02:00
template:
src: templates/vdr-xorg.conf
dest: /etc/systemd/system/vdr.service.d/vdr-xorg.conf
Wait for plymouth stop before starting x@.service
2018-01-27 20:45:31 +01:00
- name: systemd-drop-in | start x@.service after plymouth.service
template:
src: templates/x@service.d/plymouth.conf.j2
dest: /etc/systemd/system/x@.service.d/plymouth.conf
remove colon from name variables, fix org syntax error
2017-11-22 08:11:56 +01:00
- name: systemd-drop-in | start x@.service before xlogin@.service
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
template:
src: templates/x@service.d/xlogin.conf.j2
dest: /etc/systemd/system/x@.service.d/xlogin.conf
remove colon from name variables, fix org syntax error
2017-11-22 08:11:56 +01:00
- name: systemd-drop-in | load environment file for vdr.service
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
template:
src: templates/systemd/vdr-environ.j2
dest: /etc/systemd/system/vdr.service.d/load-environ.conf
remove colon from name variables, fix org syntax error
2017-11-22 08:11:56 +01:00
- name: systemd-drop-in | user@{{ vdr.uid }}.service depends on x@vt7.service
Add dependency to x@vt7.service to the user session
2017-07-31 11:45:33 +02:00
template:
add correkt KillSignal to osd2web.service
2017-07-31 12:11:28 +02:00
src: templates/user@666.service.d/x-dependency.conf.j2
Add dependency to x@vt7.service to the user session
2017-07-31 11:45:33 +02:00
dest: '/etc/systemd/system/user@{{ vdr.uid }}.service.d/x-dependency.conf'
remove colon from name variables, fix org syntax error
2017-11-22 08:11:56 +01:00
- name: vdr-config | start softhddevice detached and set audio to pulseaudio
let softhddevice start detached
2017-07-31 08:22:05 +02:00
lineinfile:
path: /etc/vdr/conf.avail/softhddevice.conf
Fix syntax error caused by typo
2017-12-17 11:31:53 +01:00
line: '{{ item }}'
let softhddevice start detached
2017-07-31 08:22:05 +02:00
with_items:
- '-D'
enable workaround for broken alsa driver messages
2018-02-23 16:00:41 +01:00
- '-w alsa-driver-broken'
let softhddevice start detached
2017-07-31 08:22:05 +02:00
# - '-a pulse' # do we need this with our existing asound.conf?
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- name: add a login shell for the user vdr
Rearrange tasks in yavdr-xorg
2017-07-16 11:05:54 +02:00
user:
name: '{{ vdr.user }}'
shell: '/bin/bash'
state: present
uid: '{{ vdr.uid }}'
groups: '{{ vdr.group }}'
append: yes
Separate installation of gui applications
2017-11-09 10:37:06 +01:00
- name: apt | install packages for xorg
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
apt:
name: '{{ item }}'
state: present
with_items:
sort packages by relevance
2017-11-09 09:50:27 +01:00
- xlogin
Use yavdr-xorg to control xlogin@vdr.service and x@vt7.service
2018-04-24 09:56:29 +02:00
- yavdr-xorg
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
- xorg
- xserver-xorg-input-all
sort packages by relevance
2017-11-09 09:50:27 +01:00
- xserver-xorg-video-all
cleanup and test basic functionality
2017-02-22 15:27:48 +01:00
- openbox
add tasks to playbooks, add dependency for on_vdr script to xorg install
2017-07-30 15:21:05 +02:00
- python3-dbus2vdr
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
- python3-yavdrfrontend
sort packages by relevance
2017-11-09 09:50:27 +01:00
- read-edid
- tmux
Add frontend script to session, install vdr-plugin-desktop
2017-07-30 21:55:48 +02:00
- vdr-plugin-desktop
Install vdr-plugin-pulsectrl and vdr-plugin-osd2web use the bluecd instead of blue
2017-12-17 10:02:09 +01:00
- vdr-plugin-osd2web
Download yaVDR Logo, install feh
2017-12-20 13:18:30 +01:00
- feh
Separate installation of gui applications
2017-11-09 10:37:06 +01:00
#- yavdr-xorg
Update
2018-04-20 15:26:52 +02:00
- name: apt | install packages for Intel IGP
Install i965-va-driver and i965-va-driver-shaders if Intel IGP is detected
2018-04-20 11:10:11 +02:00
apt:
name: '{{ item }}'
state: present
with_items:
Update
2018-04-20 15:26:52 +02:00
- xserver-xorg-video-intel
Install i965-va-driver and i965-va-driver-shaders if Intel IGP is detected
2018-04-20 11:10:11 +02:00
- i965-va-driver-shaders
when: intel_detected
fix indentation
2017-12-20 13:22:01 +01:00
- name: download yavdr logo
block:
- file:
dest: '/usr/share/yavdr/images'
state: directory
Download yaVDR Logo, install feh
2017-12-20 13:18:30 +01:00
Fix action name
2017-12-20 13:25:21 +01:00
- get_url:
url: 'https://github.com/yavdr/yavdr-base/raw/master/images/yavdr_logo.png'
Add missing quote
2017-12-20 13:22:44 +01:00
dest: '/usr/share/yavdr/images/yavdr_logo.png'
Download yaVDR Logo, install feh
2017-12-20 13:18:30 +01:00
Fix order of xlogin package installation and calling write-x11-keyboard-config
2017-12-19 14:43:55 +01:00
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
command: write-x11-keyboard-config
Fix warning, use correct "creates" argument for command
2018-01-16 09:27:25 +01:00
args:
creates: /etc/X11/xorg.conf.d/00-keyboard.conf
Fix order of xlogin package installation and calling write-x11-keyboard-config
2017-12-19 14:43:55 +01:00
# NOTE: write-x11-keyboard-config is in the xlogin package
# Ubuntu's systemd is patched, so it does not create the file automatically
Move rule to ignore eventlircd devices in xorg to own xorg.conf.d snippet
2018-01-24 10:53:05 +01:00
- name: add snippet to ignore eventlircd devices in xorg
template:
src: templates/xorg-ignore-eventlircd.conf.j2
dest: /etc/X11/xorg.conf.d/40-ignore-eventlircd.conf
Separate installation of gui applications
2017-11-09 10:37:06 +01:00
- name: apt | install desktop programs
apt:
name: '{{ item }}'
state: present
with_items:
sort packages by relevance
2017-11-09 09:50:27 +01:00
- xterm
- firefox
- kiosk-browser
Rearrange tasks in yavdr-xorg
2017-07-16 11:05:54 +02:00
#+END_SRC
Add irexec.service for the user session
2017-12-20 10:43:15 +01:00
**** detect-xorg.yml
Rearrange tasks in yavdr-xorg
2017-07-16 11:05:54 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/detect-xorg.yml :mkdirp yes :padline no
---
# file: roles/yavdr-xorg/tasks/detect-xorg.yml
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- name: "expand template for x-verbose@.service"
template:
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
src: "templates/systemd/system/x-verbose@.service.j2"
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
dest: "/etc/systemd/system/x-verbose@.service"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
- name: "expand template for xorg-verbose.conf"
template:
src: "templates/xorg-verbose.conf.j2"
dest: "/etc/X11/xorg-verbose.conf"
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
- name: Stop VDR
systemd:
name: vdr.service
state: stopped
enabled: yes
notify: ['Start VDR']
Use yavdr-xorg to control xlogin@vdr.service and x@vt7.service
2018-04-24 09:56:29 +02:00
- name: Stop yavdr-xorg
systemd:
name: 'yavdr-xorg'
state: stopped
enabled: yes
notify: ['Start yavdr-xorg']
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
- name: Stop xlogin
systemd:
use vdr.user variable for xlogin session start
2017-07-30 23:28:13 +02:00
name: 'xlogin@{{ vdr.user }}.service'
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
state: stopped
Fix handler name
2018-01-07 17:58:33 +01:00
notify: ['Start xlogin']
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
- name: Stop x
systemd:
name: x@vt7.service
state: stopped
Add block for repeated start of xorg-verbose@vt7.service
2018-01-07 17:40:29 +01:00
- name: Workaround for wrong connector names on first run
block:
- name: "wait a little bit before starting x-verbose@vt7.service (needed?)"
wait_for:
timeout: 10
- name: "start x-verbose@.service"
systemd:
name: "x-verbose@vt7.service"
state: started
enabled: false
masked: false
daemon_reload: true
- name: "wait a little bit, so X has some time to start up (needed?)"
wait_for:
timeout: 3
- name: "stop x-verbose@vt7.service"
systemd:
name: "x-verbose@vt7.service"
state: stopped
enabled: false
masked: true
Change from tag to variable first_run
2018-01-07 18:45:01 +01:00
when: first_run
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
First try to improve automatic xorg configuration in order to prevent wrong screen connection names
2018-01-07 12:56:46 +01:00
- name: "wait a little bit, so X has some time to shut down (needed?)"
wait_for:
timeout: 3
- name: "trigger udevadm reload"
command: 'udevadm trigger '
- name: "wait a little bit, so udev has some time to reapply rules (needed?)"
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
wait_for:
timeout: 3
First try to improve automatic xorg configuration in order to prevent wrong screen connection names
2018-01-07 12:56:46 +01:00
- name: "start x-verbose@.service"
Fix indentation
2018-01-07 14:53:19 +01:00
systemd:
name: "x-verbose@vt7.service"
state: started
enabled: false
masked: false
daemon_reload: true
First try to improve automatic xorg configuration in order to prevent wrong screen connection names
2018-01-07 12:56:46 +01:00
- name: "wait a little bit, so X has some time to start up (needed?)"
Fix indentation
2018-01-07 14:53:19 +01:00
wait_for:
timeout: 3
First try to improve automatic xorg configuration in order to prevent wrong screen connection names
2018-01-07 12:56:46 +01:00
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- name: "detect xorg configuration"
Allow overriding preferred refresh rate, resolution and connection for xrandr_facts module. You can set own preferences e.g. in a host_vars/localhost.yml using the variables preferred_refreshrates, preferred_resolutions and preferred_outputs (see roles/yavdr-xorg/default/main.yml for default values).
2018-05-10 22:04:45 +02:00
xrandr_facts:
preferred_refreshrates: '{{ preferred_refreshrates }}'
preferred_resolutions: '{{ preferred_resolutions }}'
preferred_outputs: '{{ preferred_outputs }}'
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
- debug:
var: xorg.primary
- debug:
var: xorg.secondary
when: xorg.secondary is defined
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- name: "stop x-verbose@vt7.service"
systemd:
name: "x-verbose@vt7.service"
state: stopped
enabled: false
masked: true
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- name: "wait a little bit, so X has some time to shut down (needed?)"
wait_for:
timeout: 3
Write local facts for results of xorg-detect
2018-01-16 14:56:51 +01:00
- name: save results
block:
Fix indentation, reorder tasks
2018-01-16 15:01:27 +01:00
- name: ensure facts.d directory exists
file:
state: directory
path: /etc/ansible/facts.d
Write data from xorg-detect as local facts for futher usage
2018-01-19 07:51:38 +01:00
- name: write xorg variable as local fact
Another syntax correction
2018-01-16 15:02:13 +01:00
copy:
Write data from xorg-detect as local facts for futher usage
2018-01-19 07:51:38 +01:00
content: '{{ {"xorg": xorg} | to_nice_json }}'
Another syntax correction
2018-01-16 15:02:13 +01:00
dest: /etc/ansible/facts.d/xorg.fact
Write data from xorg-detect as local facts for futher usage
2018-01-19 07:51:38 +01:00
- name: write xrandr variable as local fact
copy:
content: '{{ {"xrandr": xrandr} | to_nice_json }}'
dest: /etc/ansible/facts.d/xrandr.fact
Write local facts for results of xorg-detect
2018-01-16 14:56:51 +01:00
when:
- xrandr is defined
- xorg is defined
- name: update xorg and xrandr variable with values from local facts if needed
set_fact:
xorg: '{{ ansible_local.xorg }}'
xrandr: '{{ ansible_local.xrandr }}'
when:
- xrandr is undefined
- xorg is undefined
start reorganizing main.yml in roles
2017-07-30 14:29:38 +02:00
# TODO: expand template for xorg.conf (or snippets)
# with respect for the available graphics card driver
# nvidia, noveau, intel, radeon
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- name: nvidia related config
block:
- name: create xorg.conf (for nvidia driver)
template:
src: templates/xorg.conf.j2
dest: /etc/X11/xorg.conf
backup: yes
when:
- nvidia_detected
Rearrange tasks in yavdr-xorg
2017-07-16 11:05:54 +02:00
#+END_SRC
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
**** intel.yml
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
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.
This task therefore performs the following actions after the xrandr detection has been executed:
- create an initramfs-hook to copy the EDID(s) into the initramfs
- get the connector names and match them to the ones determined by xrandr
- add kernel boot arguments to set EDID and mode (refreshrate and resolution) for all outputs
- recreate and update initramfs and grub config
Please note that rescanning the connected displays works only after removing the forced loading of EDID(s) during boot (call ~clean-edids~) and a reboot.
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
#+BEGIN_SRC yaml :tangle roles/yavdr-xorg/tasks/intel.yml :mkdirp yes :padline no
- name: "create initramfs hook to copy EDID files"
copy:
src: files/include-edid-data.sh
dest: '/etc/initramfs-tools/hooks/include-edid-data'
mode: 0755
force: yes
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
- name: "create /lib/firmware/edid"
file:
state: directory
dest: /lib/firmware/edid
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
# TODO:
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
# - write EDID files to /lib/firmware/edid/
# - complete template for grub.d
name: "add kernel boot parameters for static display configuration"
template:
src: templates/grub.d/intel.j2
dest: /etc/grub.d/99_intel
mode: 0755
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
notify: ['Update Initramfs', 'Update GRUB']
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
#+END_SRC
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
*** templates
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
**** grub
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/grub.d/intel.j2 :mkdirp yes :padline no
{% set output_flag = 'D' if ("HDMI" in xorg.primary.connector or "DVI" in xorg.primary.connector or "DP" in xorg.primary.connector) else 'e' %}
GRUB_CMDLINE_LINUX+=" video={{ xorg.primary.drm_connector }}:{{ xorg.primary.mode|replace('_', '@') }}{{ output_flag }} drm.edid_firmware={{ xorg.primary.drm_connector }}:edid/edid.bin"
# TODO: configure additional monitors (second monitor on, all others off)
#+END_SRC
more formatting corrections, add yavdr-remote role
2017-06-20 16:20:24 +02:00
**** xorg
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
***** x-verbose@.service
#+BEGIN_SRC conf :tangle "roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2" :padline no
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
# file: roles/yavdr-xorg/templates/systemd/system/x-verbose@.service.j2
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
[Unit]
Description=X with verbose logging on %I
Wants=graphical.target
Before=graphical.target
[Service]
Type=forking
Fix Path for xorg.conf when running xorg-debug@.service
2017-11-09 08:36:17 +01:00
ExecStart=/usr/bin/x-daemon -logverbose 6 -noreset %I -config /etc/X11/xorg-verbose.conf
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
#+END_SRC
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
***** Drop-in snippet for x@.service
Wait for plymouth stop before starting x@.service
2018-01-27 20:45:31 +01:00
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/x@service.d/plymouth.conf.j2 :mkdirp yes :padline no
[Unit]
After=plymouth.service
#+END_SRC
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/x@service.d/xlogin.conf.j2 :mkdirp yes :padline no
[Unit]
add .service extension to dependency
2017-09-12 09:26:43 +02:00
Before=xlogin@{{ vdr.user }}.service
start x@.service before xlogin@{{ vdr.user }}
2017-07-31 10:38:02 +02:00
#+END_SRC
Add dependency to x@vt7.service to the user session
2017-07-31 11:45:33 +02:00
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/user@666.service.d/x-dependency.conf.j2 :mkdirp yes :padline no
[Unit]
Wants=x@vt7.service
After=x@vt7.service
[Service]
TimeoutStopSec=20
KillMode=mixed
#+END_SRC
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
***** Drop-in snippet for vdr.service
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/vdr-xorg.conf :mkdirp yes :padline no
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
[Unit]
After=x@vt7.service
Wants=x@vt7.service
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
#BindsTo=x@vt7.service
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
#+END_SRC
Move rule to ignore eventlircd devices in xorg to own xorg.conf.d snippet
2018-01-24 10:53:05 +01:00
***** xorg.conf snippets
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg-ignore-eventlircd.conf.j2
{{ ansible_managed | comment }}
Section "InputClass"
Identifier "exclude eventlircd devices"
MatchTag "eventlircd"
Option "Ignore" "True"
EndSection
#+END_SRC
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
***** xorg.conf
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg-verbose.conf.j2
Section "Device"
Identifier "nvidia"
Driver "nvidia"
Option "DynamicTwinView" "true"
Option "NoFlip" "false"
EndSection
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Section "Screen"
Identifier "screen"
Device "nvidia"
EndSection
merge
2017-05-12 18:21:26 +02:00
#+END_SRC
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/xorg.conf.j2
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
merge
2017-05-12 18:21:26 +02:00
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Section "ServerLayout"
Identifier "Layout0"
Update xorg.conf template for dual screen
2017-07-16 09:58:23 +02:00
Screen 0 "Screen0" 0 0
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
{% if xorg.secondary is defined %}
Screen 1 "Screen1" RightOf "Screen0"
{% endif %}
#InputDevice "Keyboard0" "CoreKeyboard"
#InputDevice "Mouse0" "CorePointer"
Update xorg.conf template for dual screen
2017-07-16 09:58:23 +02:00
Option "Xinerama" "0"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
EndSection
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Section "InputClass"
Identifier "exclude eventlircd devices"
MatchTag "eventlircd"
Option "Ignore" "True"
EndSection
Section "Monitor"
Identifier "Monitor0"
VendorName "{{ xorg.primary.vendor }}"
ModelName "{{ xorg.primary.model }}"
Option "DPMS"
Option "ExactModeTimingsDVI" "True"
EndSection
Section "Device"
Identifier "Device0"
Driver "nvidia"
VendorName "NVIDIA Corporation"
Update xorg.conf template for dual screen
2017-07-16 09:58:23 +02:00
Option "NoLogo" "true"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
{% if xorg.primary.bus_id is defined %}
BoardName "{{ xorg.primary.gpu_name }}"
BusID "{{ xorg.primary.bus_id }}"
{% else %}
BoardName "Unknown"
{% endif %}
Screen 0
Move EDID settings to first device section
2018-01-27 21:01:04 +01:00
Option "ConnectedMonitor" "{{ xorg.primary.connector }}{% if xorg.secondary is defined %}, {{ xorg.secondary.connector }}{% endif %}"
Option "CustomEDID" "{{ xorg.primary.connector }}:/etc/X11/edid.{{ xorg.primary.connector }}.bin{% if xorg.secondary is defined %};{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin{% endif %}"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
EndSection
Section "Screen"
Identifier "Screen0"
Device "Device0"
Monitor "Monitor0"
DefaultDepth 24
Option "nvidiaXineramaInfoOrder" "{{ xorg.primary.connector }}"
Option "UseDisplayDevice" "{{ xorg.primary.connector }}"
Disable Composite and Force(Full)CompositionPipeline by default Even a GTX 1030 has a choppy image on fast movements (e.g. football)
2018-06-02 20:03:24 +02:00
Option "metamodes" "{{ xorg.primary.connector }}: {{ xorg.primary.mode }} +0+0 {ForceCompositionPipeline=Off, ForceFullCompositionPipeline=Off}"
ForceFullCompositionPipeline for nvidia cards to prevent screen tearing when playing video with xineliboutput-sxfe or other video players which use opengl components
2018-01-03 13:19:59 +01:00
Option "AllowIndirectGLXProtocol" "off"
Option "TripleBuffer" "on"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Option "SLI" "Off"
Option "MultiGPU" "Off"
Option "BaseMosaic" "off"
SubSection "Display"
Depth 24
EndSubSection
EndSection
{% if xorg.secondary is defined %}
Section "Device"
Identifier "Device1"
Driver "nvidia"
VendorName "NVIDIA Corporation"
Option "NoLogo" "true"
{% if xorg.secondary.bus_id is defined %}
BoardName "{{ xorg.primary.gpu_name }}"
BusID "{{ xorg.primary.bus_id }}"
{% else %}
BoardName "Unknown"
{% endif %}
Screen 1
EndSection
Section "Monitor"
Identifier "Monitor1"
VendorName "{{ xorg.secondary.vendor }}"
ModelName "{{ xorg.secondary.model }}"
EndSection
Section "Screen"
Identifier "Screen1"
Device "Device1"
Monitor "Monitor1"
DefaultDepth 24
Option "nvidiaXineramaInfoOrder" "{{ xorg.secondary.connector }}"
Move EDID settings to first device section
2018-01-27 21:01:04 +01:00
#Option "ConnectedMonitor" "{{ xorg.secondary.connector }}"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Option "UseDisplayDevice" "{{ xorg.secondary.connector }}"
Move EDID settings to first device section
2018-01-27 21:01:04 +01:00
#Option "CustomEDID" "{{ xorg.secondary.connector }}:/etc/X11/edid.{{ xorg.secondary.connector }}.bin"
Disable Composite and Force(Full)CompositionPipeline by default Even a GTX 1030 has a choppy image on fast movements (e.g. football)
2018-06-02 20:03:24 +02:00
Option "metamodes" "{{ xorg.secondary.connector }}: {{ xorg.secondary.mode }} +0+0 {ForceCompositionPipeline=Off, ForceFullCompositionPipeline=Off}"
ForceFullCompositionPipeline for nvidia cards to prevent screen tearing when playing video with xineliboutput-sxfe or other video players which use opengl components
2018-01-03 13:19:59 +01:00
Option "AllowIndirectGLXProtocol" "off"
Option "TripleBuffer" "on"
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Option "SLI" "Off"
Option "MultiGPU" "Off"
Option "BaseMosaic" "off"
SubSection "Display"
Depth 24
EndSubSection
EndSection
{% endif %}
Disable Composite and Force(Full)CompositionPipeline by default Even a GTX 1030 has a choppy image on fast movements (e.g. football)
2018-06-02 20:03:24 +02:00
Section "Extensions"
Option "Composite" "Disable"
EndSection
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
#+END_SRC
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
#+BEGIN_SRC shell :tangle roles/template-test/templates/xorg.conf_test.j2
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
Section "ServerLayout"
Identifier "Layout0"
Screen 0 "Screen0"
{% if xorg.best_tv_mode.secondary is defined %}
Screen 1 "Screen1" RightOf "Screen0"
{% endif %}
InputDevice "Keyboard0" "CoreKeyboard"
InputDevice "Mouse0" "CorePointer"
EndSection
Section "InputDevice"
# generated from default
Identifier "Mouse0"
Driver "mouse"
Option "Protocol" "auto"
Option "Device" "/dev/psaux"
Option "Emulate3Buttons" "no"
Option "ZAxisMapping" "4 5"
EndSection
# ignore devices with eventlircd tag
# ENV{ID_INPUT.tags}+="eventlircd"
# must be set by an udev rule
Section "InputClass"
Identifier "ignore eventlircd devices"
MatchTag "eventlircd"
Option "Ignore" "True"
EndSection
Section "InputDevice"
# generated from default
Identifier "Keyboard0"
Driver "kbd"
EndSection
Section "Monitor"
Identifier "Monitor0"
VendorName "Unknown"
ModelName "Unknown"
{# TODO: VGA2SCART support (if needed)
{% if system.x11.display.0.default == "VGA2Scart_4_3" or system.x11.display.0.default == "VGA2Scart_16_9" %}
HorizSync 14-17
VertRefresh 49-61
{% if system.x11.display.0.default == "VGA2Scart_4_3" %}
Modeline "VGA2Scart_4_3" 13.875 720 744 808 888 576 580 585 625 -HSync -Vsync interlace
{% elif system.x11.display.0.default == "VGA2Scart_16_9" %}
Modeline "VGA2Scart_16_9" 19 1024 1032 1120 1216 576 581 586 625 -Hsync -Vsync interlace
{% endif %}
{% endif %}
#}
Option "DPMS"
Option "ExactModeTimingsDVI" "True"
EndSection
{% if xrandr.best_tv_mode.secondary is defined %}
Section "Monitor"
Identifier "Monitor1"
VendorName "Unknown"
ModelName "Unknown"
{#
{% if system.x11.display.1.default in ("VGA2Scart_4_3", "VGA2Scart_16_9") %}
HorizSync 14-17
VertRefresh 49-61
{% if system.x11.display.1.default == "VGA2Scart_4_3" %}
Modeline "VGA2Scart_4_3" 13.875 720 744 808 888 576 580 585 625 -HSync -Vsync interlace
{% elif system.x11.display.1.default == "VGA2Scart_16_9" %}
Modeline "VGA2Scart_16_9" 19 1024 1032 1120 1216 576 581 586 625 -Hsync -Vsync interlace
{% endif %}
Option "DPMS"
Option "ExactModeTimingsDVI" "True"
{% endif %}
#}
EndSection
{% endif %}
Section "Device"
Identifier "Device0"
{% if system.hardware.nvidia.detected %}
Driver "nvidia"
VendorName "NVIDIA Corporation"
{% endif %}
Screen 0
Option "DPI" "100x100"
{% if system.hardware.nvidia.busid is defined and system.hardware.busid %}
BusID "PCI: {{ system.hardware.nvidia.busid }}"
{% endif %}
Option "NoLogo" "True"
Option "UseEvents" "True"
Option "TripleBuffer" "False"
Option "AddARGBGLXVisuals" "True"
Option "TwinView" "0"
Option "DynamicTwinView" "0"
Option "OnDemandVBlankinterrupts" "on"
Option "FlatPanelProperties" "Scaling = Native"
EndSection
{% if xrandr.best_tv_mode.secondary is defined %}
Section "Device"
Identifier "Device1"
{% if system.hardware.nvidia.detected %}
Driver "nvidia"
VendorName "NVIDIA Corporation"
{% endif %}
Screen 1
{% if system.hardware.nvidia.busid is defined and system.hardware.nvidia.busid %}
BusID "PCI: {{ system.hardware.nvidia.busid }}"
{% endif %}
Option "NoLogo" "True"
Option "UseEvents" "True"
Option "TripleBuffer" "False"
Option "AddARGBGLXVisuals" "True"
Option "TwinView" "0"
Option "DynamicTwinView" "0"
EndSection
{% endif %}
Section "Screen"
Identifier "Screen0"
Device "Device0"
Monitor "Monitor0"
DefaultDepth 24
SubSection "Display"
Depth 24
{% if xrandr.best_tv_mode.primary is defined %}
Modes "{{ xrandr.best_tv_mode.primary.mode }}"{#{% for mode in xrandr %}{% if mode != system.x11.display.0.default %} "{{ mode }}"{% endif %}{% endfor %}#} nvidia-auto-select
{% elif system.hardware.nvidia.detected == 1 %}
Modes "nvidia-auto-select"
{% endif %}
EndSubSection
{% if system.x11.display.0.default or system.x11.default %}
{% if system.x11.display.0.device is definded and system.x11.display.0.device %}
Option "ConnectedMonitor" {{ system.x11.display.0.device }}
{% else %}
Option "ConnectedMonitor" {{ system.x11.default }}
{% endif %}
# Option "ConnectedMonitor" "<?cs if:(?system.x11.display.0.device) ?><?cs call:fix_display_name(system.x11.display.0.device) ?><?cs else ?><?cs var:system.x11.default ?><?cs /if ?><?cs if:(?system.x11.dualhead.enabled && system.x11.dualhead.enabled == 1) ?>, <?cs call:fix_display_name(system.x11.display.1.device) ?><?cs /if ?>"
#Option "ConnectedMonitor"
"<?cs if:(?system.x11.display.0.device) ?>
<?cs call:fix_display_name(system.x11.display.0.device) ?>
<?cs else ?>
<?cs var:system.x11.default ?>
<?cs /if ?>
<?cs if:(?system.x11.dualhead.enabled && system.x11.dualhead.enabled == 1) ?>, <?cs call:fix_display_name(system.x11.display.1.device) ?><?cs /if ?>"
# Option "UseDisplayDevice" "<?cs if:(?system.x11.display.0.device) ?><?cs call:fix_display_name(system.x11.display.0.device) ?><?cs else ?><?cs var:system.x11.default ?><?cs /if ?>"
# <?cs /if ?>
# <?cs if:(?system.hardware.nvidia.0.edid && system.hardware.nvidia.0.edid == "1") ?>
# Option "CustomEDID" "<?cs call:fix_display_name(system.x11.display.0.device) ?>:/etc/X11/edid.0.yavdr"
# <?cs /if ?>
# <?cs if:(system.hardware.nvidia.detected == 1 && ?system.x11.display.0.device) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.0.device) ?>: <?cs var:system.x11.display.0.default ?> { ViewPortIn=<?cs var:system.x11.display.0.viewport.in.x ?>x<?cs var:system.x11.display.0.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.0.viewport.out.x ?>x<?cs var:system.x11.display.0.viewport.out.y ?>+<?cs var:system.x11.display.0.viewport.out.plusx ?>+<?cs var:system.x11.display.0.viewport.out.plusy ?> }"
# <?cs each:mode = system.x11.display.0.mode ?><?cs if:(mode != system.x11.display.0.default) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.0.device) ?>: <?cs var:mode ?> { ViewPortIn=<?cs var:system.x11.display.0.viewport.in.x ?>x<?cs var:system.x11.display.0.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.0.viewport.out.x ?>x<?cs var:system.x11.display.0.viewport.out.y ?>+<?cs var:system.x11.display.0.viewport.out.plusx ?>+<?cs var:system.x11.display.0.viewport.out.plusy ?> }"<?cs /if ?><?cs /each ?>
{% endif %}
EndSection
{% if system.x11.dualhead.enabled == "1" %}
Section "Screen"
Identifier "Screen1"
Device "Device1"
Monitor "Monitor1"
DefaultDepth 24
SubSection "Display"
Depth 24
{% if system.x11.display.0.default is defined and system.x11.display.0.default %}
Modes "{{ system.x11.display.1.default }}"{% for mode in system.x11.display.1.mode %}{% if mode != system.x11.display.1.default %} "{{ mode }}"{% endif %}{% endfor %}
{% elif system.hardware.nvidia.detected == "1" %}
Modes "nvidia-auto-select"
{% endif %}
EndSubSection
# <?cs if:(?system.x11.display.1.default && system.x11.display.1.default != "" && system.x11.display.1.default != "disabled") ?>
# Option "UseDisplayDevice" "<?cs call:fix_display_name(system.x11.display.1.device) ?>"
# <?cs /if ?>
# <?cs if:(?system.hardware.nvidia.1.edid && system.hardware.nvidia.1.edid == "1") ?>
# Option "CustomEDID" "<?cs call:fix_display_name(system.x11.display.1.device) ?>:/etc/X11/edid.1.yavdr"
# <?cs /if ?>
# <?cs if:(system.hardware.nvidia.detected == 1 && ?system.x11.display.1.device) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.1.device) ?>: <?cs var:system.x11.display.1.default ?> { ViewPortIn=<?cs var:system.x11.display.1.viewport.in.x ?>x<?cs var:system.x11.display.1.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.1.viewport.out.x ?>x<?cs var:system.x11.display.1.viewport.out.y ?>+<?cs var:system.x11.display.1.viewport.out.plusx ?>+<?cs var:system.x11.display.1.viewport.out.plusy ?> }"
# <?cs each:mode = system.x11.display.1.mode ?><?cs if:(mode != system.x11.display.1.default) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.1.device) ?>: <?cs var:mode ?> { ViewPortIn=<?cs var:system.x11.display.1.viewport.in.x ?>x<?cs var:system.x11.display.1.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.1.viewport.out.x ?>x<?cs var:system.x11.display.1.viewport.out.y ?>+<?cs var:system.x11.display.1.viewport.out.plusx ?>+<?cs var:system.x11.display.1.viewport.out.plusy ?> }"<?cs /if ?><?cs /each ?>
# <?cs /if ?>
EndSection
{% endif %}
#+END_SRC
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
**** vdr
Load environment variables from /etc/default/locale
2018-04-24 09:34:44 +02:00
Set environment variables for system locale and user session on startup
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
#+BEGIN_SRC conf :tangle roles/yavdr-xorg/templates/systemd/vdr-environ.j2
[Service]
Load environment variables from /etc/default/locale
2018-04-24 09:34:44 +02:00
EnvironmentFile=-/etc/default/locale
add basic XDG_RUNTIME_DIR
2017-07-31 00:22:10 +02:00
Environment=XDG_RUNTIME_DIR=/run/user/{{ vdr.uid }}/
vdr.service: load environment from user session, create avahi services
2017-06-22 13:28:10 +02:00
EnvironmentFile=-/var/lib/vdr/.session-env
#+END_SRC
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
*** files
**** initramfs EDID hook
#+BEGIN_SRC shell :tangle roles/yavdr-xorg/files/cp-edid-data.sh
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
#!/bin/bash
# Created by yavdr-ansible.
# This hook copies EDID files with the naming scheme "edid.${OUTPUT}.bin" to the initramfs.
[ "$1" = "prereqs" ] && { echo "udev"; exit 0; }
# load hook helper functions
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
. /usr/share/initramfs-tools/hook-functions
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
rm /lib/firmware/edid/edid.*.bin
find "/etc/X11/" -name "edid.*.bin" -type f -exec cp -t "/lib/firmware/edid/" {} +
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
mkdir -p "${DESTDIR}/lib/firmware/edid"
Add a description, TODO-list and improve initramfs-hook
2018-06-08 19:54:17 +02:00
find "/etc/X11/" -name "edid.*.bin" -type f -exec cp -t "${DESTDIR}/lib/firmware/edid/" {} +
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
manual_add_modules i915 radeon
exit 0
#+END_SRC
Set X11 keyboard configuration according to /etc/default/keyboard values
2017-12-17 10:38:12 +01:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
** yavdr-desktop
*** Tasks
**** main.yml
#+BEGIN_SRC yaml :tangle roles/yavdr-desktop/tasks/main.yml :mkdirp yes :padline no
---
# file: roles/yavdr-desktop/tasks/main.yml
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create folders for user configuration files
file:
state: directory
dest: '{{ item }}'
mode: '0775'
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
with_items:
- '{{ vdr.home }}/.config/systemd/user'
- '{{ vdr.home }}/.config/openbox'
- '{{ vdr.home }}/.config/pulse'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: expand template for .xinitrc for vdr user
template:
src: 'templates/.xinitrc.j2'
dest: '{{ vdr.home }}/.xinitrc'
mode: 0755
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: "expand template for vdr's .Xresources"
template:
src: 'templates/.Xresources.j2'
dest: '{{ vdr.home }}/.Xresources'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: expand template for openbox autostart
template:
src: 'templates/openbox/autostart.j2'
dest: '{{ vdr.home }}/.config/openbox/autostart'
mode: 0755
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: expand rc.xml for openbox
template:
src: 'templates/openbox/rc.xml.j2'
dest: '{{ vdr.home }}/.config/openbox/rc.xml'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Special configuration for openbox on second display do not focus new windows
2018-08-05 13:57:19 +02:00
- name: expand rc2.xml for openbox on second display
template:
src: 'templates/openbox/rc2.xml.j2'
dest: '{{ vdr.home }}/.config/openbox/rc2.xml'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create yavdr-desktop.target for the user session
template:
src: 'templates/systemd/user/yavdr-desktop.target.j2'
dest: '{{ vdr.home }}/.config/systemd/user/yavdr-desktop.target'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: disable pulseaudio autospawning
lineinfile:
path: '{{ vdr.home }}/.config/pulse/client.conf'
line: 'autospawn = yes'
create: yes
state: present
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create tmux.service for the session
template:
src: 'templates/systemd/user/tmux.service.j2'
dest: '{{ vdr.home }}/.config/systemd/user/tmux.service'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create wm-exit.service for the session
template:
src: templates/systemd/user/wm-exit.service.j2
dest: '{{ vdr.home }}/.config/systemd/user/wm-exit.service'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
add wm-exit.service for the user session
2017-07-31 12:26:50 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create detect-second-display.service for the session
template:
src: templates/systemd/user/detect-second-display.service.j2
dest: '{{ vdr.home }}/.config/systemd/user/detect-second-display.service'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
add wm-exit.service for the user session
2017-07-31 12:26:50 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create openbox-second.service for the session
template:
src: templates/systemd/user/openbox-second.service.j2
dest: '{{ vdr.home }}/.config/systemd/user/openbox-second.service'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
Add irexec.service for the user session
2017-12-20 10:43:15 +01:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create osd2web.service for the session
template:
src: templates/systemd/user/osd2web.service.j2
dest: '{{ vdr.home }}/.config/systemd/user/osd2web.service'
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
mode: 0644
Add irexec.service for the user session
2017-12-20 10:43:15 +01:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
- name: create irexec configuration for the session
block:
- template:
src: templates/systemd/user/irexec.service.j2
dest: '{{ vdr.home }}/.config/systemd/user/irexec.service'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
- template:
src: templates/.lircrc.j2
dest: '{{ vdr.home }}/.lircrc'
mode: 0644
owner: '{{ vdr.user }}'
group: '{{ vdr.group }}'
- name: link /usr/bin/start-desktop to /var/lib/vdr/plugins/desktop/starter
file:
src: /usr/bin/start-desktop
dest: /var/lib/vdr/plugins/desktop/starter
state: link
Use yavdr-xorg to control xlogin@vdr.service and x@vt7.service
2018-04-24 09:56:29 +02:00
- name: enable and start yavdr-xorg for the vdr user
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
systemd:
daemon_reload: yes
Use yavdr-xorg to control xlogin@vdr.service and x@vt7.service
2018-04-24 09:56:29 +02:00
name: 'yavdr-xorg'
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
enabled: yes
state: started
Add irexec.service for the user session
2017-12-20 10:43:15 +01:00
#+END_SRC
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
*** Templates
rearrange some tasks
2018-02-12 10:27:01 +01:00
**** xorg configuration
Add .Xresources.j2 template
2018-02-12 09:14:14 +01:00
***** .Xresources
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.Xresources.j2 :mkdirp yes :padline no
xterm*background: Black
xterm*foreground: grey
XTerm*locale: true
XTerm*metaSendsEscape: true
XTerm*eightBitInput: false
XTerm*backarrowKey: false
XTerm*ttyModes: erase ^?
Xterm*saveLines: 4096
XTerm.vt100.metaSendsEscape: true
XTerm.vt100.geometry: 80x32
XTerm.vt100.renderFont: true
xterm*faceName: xft:DejaVu Sans Mono
xterm*faceSize: 14
xterm*renderFont: true
XTerm.vt100.faceName: xft:DejaVu Sans Mono:size=12:antialias=false
XTerm.vt100.font: 7x13
#+END_SRC
rearrange some tasks
2018-02-12 10:27:01 +01:00
***** .xinitrc
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.xinitrc.j2 :mkdirp yes :padline no
#!/bin/bash
{{ ansible_managed | comment }}
exec openbox-session
#+END_SRC
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
**** openbox
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
***** autostart
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/openbox/autostart.j2 :mkdirp yes :shebang #!/bin/bash
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
# forward environment variables to an environment file and the systemd user session
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
env | grep "DISPLAY\|DBUS_SESSION_BUS_ADDRESS\|XDG_RUNTIME_DIR" > ~/.session-env
systemctl --user import-environment DISPLAY XAUTHORITY XDG_RUNTIME_DIR DBUS_SESSION_BUS_ADDRESS
Set background with feh
2017-12-20 13:31:36 +01:00
feh --bg-center "/usr/share/yavdr/images/yavdr_logo.png"
Add frontend script to session, install vdr-plugin-desktop
2017-07-30 21:55:48 +02:00
enabled_services=(
"tmux.service" "detect-second-display.service"
"openbox-second.service" "osd2web.service"
Enable pulseaudio for the session
2017-07-30 23:09:58 +02:00
"yavdr-frontend.service" "pulseaudio.socket"
Automatically start irexec.service
2017-12-20 11:00:15 +01:00
"pulseaudio.service" "wm-exit.service" "irexec.service")
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
disabled_services=()
# enable configured services for the user session
for service in "${enabled_services[@]}"; do
systemctl --user enable "$service"
done
# disable unwanted services for the user session
for service in "${disabled_services[@]}"; do
systemctl --user disable "$service"
done
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
if which dbus-update-activation-environment >/dev/null 2>&1; then
dbus-update-activation-environment DISPLAY XAUTHORITY XDG_RUNTIME_DIR
fi
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
# start systemd units for the yavdr user session
systemctl --user isolate yavdr-desktop.target
#+END_SRC
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
***** rc.xml
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
#+BEGIN_SRC xml :tangle roles/yavdr-desktop/templates/openbox/rc.xml.j2 :mkdirp yes :padline no
fix indentation errors
2017-06-20 16:38:38 +02:00
<?xml version="1.0" encoding="UTF-8"?>
<openbox_config xmlns="http://openbox.org/3.4/rc" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- Do not edit this file, it will be overwritten on install.
Copy the file to $HOME/.config/openbox/ instead. -->
<resistance>
<strength>10</strength>
<screen_edge_strength>20</screen_edge_strength>
</resistance>
<focus>
<focusNew>yes</focusNew>
<!-- always try to focus new windows when they appear. other rules do
apply -->
<followMouse>no</followMouse>
<!-- move focus to a window when you move the mouse into it -->
<focusLast>yes</focusLast>
<!-- focus the last used window when changing desktops, instead of the one
under the mouse pointer. when followMouse is enabled -->
<underMouse>no</underMouse>
<!-- move focus under the mouse, even when the mouse is not moving -->
<focusDelay>200</focusDelay>
<!-- when followMouse is enabled, the mouse must be inside the window for
this many milliseconds (1000 = 1 sec) before moving focus to it -->
<raiseOnFocus>no</raiseOnFocus>
<!-- when followMouse is enabled, and a window is given focus by moving the
mouse into it, also raise the window -->
</focus>
<placement>
<policy>Smart</policy>
<!-- 'Smart' or 'UnderMouse' -->
<center>yes</center>
<!-- whether to place windows in the center of the free area found or
the top left corner -->
<monitor>Active</monitor>
<!-- with Smart placement on a multi-monitor system, try to place new windows
on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
the active window is, 'Primary' - only on the primary monitor -->
<primaryMonitor>Active</primaryMonitor>
<!-- The monitor where Openbox should place popup dialogs such as the
focus cycling popup, or the desktop switch popup. It can be an index
from 1, specifying a particular monitor. Or it can be one of the
following: 'Mouse' - where the mouse is, or
'Active' - where the active window is -->
</placement>
<theme>
<name>Onyx</name>
<titleLayout>NLIMC</titleLayout>
<!--
available characters are NDSLIMC, each can occur at most once.
N: window icon
L: window label (AKA title).
I: iconify
M: maximize
C: close
S: shade (roll up/down)
D: omnipresent (on all desktops).
-->
Change rc.xml for openbox to be less restrictive
2017-12-26 20:47:38 +01:00
<keepBorder>no</keepBorder>
fix indentation errors
2017-06-20 16:38:38 +02:00
<animateIconify>yes</animateIconify>
<font place="ActiveWindow">
<name>sans</name>
<size>8</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="InactiveWindow">
<name>sans</name>
<size>8</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="MenuHeader">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>normal</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="MenuItem">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>normal</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="ActiveOnScreenDisplay">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="InactiveOnScreenDisplay">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
</theme>
<desktops>
<!-- this stuff is only used at startup, pagers allow you to change them
during a session
these are default values to use when other ones are not already set
by other applications, or saved in your session
use obconf if you want to change these without having to log out
and back in -->
<number>2</number>
<firstdesk>1</firstdesk>
<names>
<!-- set names up here if you want to, like this:
<name>desktop 1</name>
<name>desktop 2</name>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
-->
fix indentation errors
2017-06-20 16:38:38 +02:00
</names>
<popupTime>875</popupTime>
<!-- The number of milliseconds to show the popup for when switching
desktops. Set this to 0 to disable the popup. -->
</desktops>
<resize>
<drawContents>yes</drawContents>
<popupShow>Nonpixel</popupShow>
<!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
<popupPosition>Center</popupPosition>
<!-- 'Center', 'Top', or 'Fixed' -->
<popupFixedPosition>
<!-- these are used if popupPosition is set to 'Fixed' -->
<x>10</x>
<!-- positive number for distance from left edge, negative number for
distance from right edge, or 'Center' -->
<y>10</y>
<!-- positive number for distance from top edge, negative number for
distance from bottom edge, or 'Center' -->
</popupFixedPosition>
</resize>
<!-- You can reserve a portion of your screen where windows will not cover when
they are maximized, or when they are initially placed.
Many programs reserve space automatically, but you can use this in other
cases. -->
<margins>
<top>0</top>
<bottom>0</bottom>
<left>0</left>
<right>0</right>
</margins>
<dock>
<position>TopLeft</position>
<!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
<floatingX>0</floatingX>
<floatingY>0</floatingY>
<noStrut>no</noStrut>
<stacking>Above</stacking>
<!-- 'Above', 'Normal', or 'Below' -->
<direction>Vertical</direction>
<!-- 'Vertical' or 'Horizontal' -->
<autoHide>no</autoHide>
<hideDelay>300</hideDelay>
<!-- in milliseconds (1000 = 1 second) -->
<showDelay>300</showDelay>
<!-- in milliseconds (1000 = 1 second) -->
<moveButton>Middle</moveButton>
<!-- 'Left', 'Middle', 'Right' -->
</dock>
<keyboard>
<chainQuitKey>C-g</chainQuitKey>
<!-- Keybindings for desktop switching -->
<keybind key="C-A-Left">
<action name="GoToDesktop">
<to>left</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="C-A-Right">
<action name="GoToDesktop">
<to>right</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="C-A-Up">
<action name="GoToDesktop">
<to>up</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="C-A-Down">
<action name="GoToDesktop">
<to>down</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Left">
<action name="SendToDesktop">
<to>left</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Right">
<action name="SendToDesktop">
<to>right</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Up">
<action name="SendToDesktop">
<to>up</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Down">
<action name="SendToDesktop">
<to>down</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="W-F1">
<action name="GoToDesktop">
<to>1</to>
</action>
</keybind>
<keybind key="W-F2">
<action name="GoToDesktop">
<to>2</to>
</action>
</keybind>
<keybind key="W-F3">
<action name="GoToDesktop">
<to>3</to>
</action>
</keybind>
<keybind key="W-F4">
<action name="GoToDesktop">
<to>4</to>
</action>
</keybind>
<keybind key="W-d">
<action name="ToggleShowDesktop"/>
</keybind>
<!-- Keybindings for windows -->
<keybind key="A-F4">
<action name="Close"/>
</keybind>
<keybind key="A-Escape">
<action name="Lower"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
</keybind>
<keybind key="A-space">
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
</keybind>
<!-- Take a screenshot of the current window with scrot when Alt+Print are pressed -->
<keybind key="A-Print">
<action name="Execute">
<command>scrot -s</command>
</action>
</keybind>
<!-- Keybindings for window switching -->
<keybind key="A-Tab">
<action name="NextWindow">
<finalactions>
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</finalactions>
</action>
</keybind>
<keybind key="A-S-Tab">
<action name="PreviousWindow">
<finalactions>
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</finalactions>
</action>
</keybind>
<keybind key="C-A-Tab">
<action name="NextWindow">
<panels>yes</panels>
<desktop>yes</desktop>
<finalactions>
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</finalactions>
</action>
</keybind>
<!-- Keybindings for window switching with the arrow keys -->
<keybind key="W-S-Right">
<action name="DirectionalCycleWindows">
<direction>right</direction>
</action>
</keybind>
<keybind key="W-S-Left">
<action name="DirectionalCycleWindows">
<direction>left</direction>
</action>
</keybind>
<keybind key="W-S-Up">
<action name="DirectionalCycleWindows">
<direction>up</direction>
</action>
</keybind>
<keybind key="W-S-Down">
<action name="DirectionalCycleWindows">
<direction>down</direction>
</action>
</keybind>
</keyboard>
<mouse>
<dragThreshold>1</dragThreshold>
<!-- number of pixels the mouse must move before a drag begins -->
<doubleClickTime>500</doubleClickTime>
<!-- in milliseconds (1000 = 1 second) -->
<screenEdgeWarpTime>400</screenEdgeWarpTime>
<!-- Time before changing desktops when the pointer touches the edge of the
screen while moving a window, in milliseconds (1000 = 1 second).
Set this to 0 to disable warping -->
<screenEdgeWarpMouse>false</screenEdgeWarpMouse>
<!-- Set this to TRUE to move the mouse pointer across the desktop when
switching due to hitting the edge of the screen -->
<context name="Frame">
<mousebind button="A-Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="A-Left" action="Click">
<action name="Unshade"/>
</mousebind>
<mousebind button="A-Left" action="Drag">
<action name="Move"/>
</mousebind>
<mousebind button="A-Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="A-Right" action="Drag">
<action name="Resize"/>
</mousebind>
<mousebind button="A-Middle" action="Press">
<action name="Lower"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
</mousebind>
<mousebind button="A-Up" action="Click">
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="GoToDesktop">
fix indentation errors
2017-06-20 16:38:38 +02:00
<to>previous</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="A-Down" action="Click">
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="GoToDesktop">
fix indentation errors
2017-06-20 16:38:38 +02:00
<to>next</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="C-A-Up" action="Click">
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="GoToDesktop">
fix indentation errors
2017-06-20 16:38:38 +02:00
<to>previous</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="C-A-Down" action="Click">
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="GoToDesktop">
fix indentation errors
2017-06-20 16:38:38 +02:00
<to>next</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="A-S-Up" action="Click">
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="SendToDesktop">
fix indentation errors
2017-06-20 16:38:38 +02:00
<to>previous</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="A-S-Down" action="Click">
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="SendToDesktop">
fix indentation errors
2017-06-20 16:38:38 +02:00
<to>next</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Titlebar">
<mousebind button="Left" action="Drag">
<action name="Move"/>
</mousebind>
<mousebind button="Left" action="DoubleClick">
<action name="ToggleMaximize"/>
</mousebind>
<mousebind button="Up" action="Click">
<action name="if">
<shaded>no</shaded>
<then>
<action name="Shade"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
<action name="Lower"/>
</then>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="Down" action="Click">
<action name="if">
<shaded>yes</shaded>
<then>
<action name="Unshade"/>
<action name="Raise"/>
</then>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Middle" action="Press">
<action name="Lower"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="ShowMenu">
<menu>client-menu</menu>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Top">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>top</edge>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Left">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>left</edge>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Right">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>right</edge>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Bottom">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>bottom</edge>
</action>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="TRCorner BRCorner TLCorner BLCorner">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Drag">
<action name="Resize"/>
</mousebind>
</context>
<context name="Client">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Middle" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
</context>
<context name="Icon">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
<action name="ShowMenu">
<menu>client-menu</menu>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="ShowMenu">
<menu>client-menu</menu>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="AllDesktops">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="ToggleOmnipresent"/>
</mousebind>
</context>
<context name="Shade">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="ToggleShade"/>
</mousebind>
</context>
<context name="Iconify">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="Iconify"/>
</mousebind>
</context>
<context name="Maximize">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Middle" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="ToggleMaximize"/>
</mousebind>
<mousebind button="Middle" action="Click">
<action name="ToggleMaximize">
<direction>vertical</direction>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="Right" action="Click">
<action name="ToggleMaximize">
<direction>horizontal</direction>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
</context>
<context name="Close">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="Close"/>
</mousebind>
</context>
<context name="Desktop">
<mousebind button="Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="C-A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="C-A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</action>
fix indentation errors
2017-06-20 16:38:38 +02:00
</mousebind>
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
</context>
<context name="Root">
<!-- Menus -->
<mousebind button="Middle" action="Press">
<action name="ShowMenu">
<menu>client-list-combined-menu</menu>
</action>
</mousebind>
<mousebind button="Right" action="Press">
<action name="ShowMenu">
<menu>root-menu</menu>
</action>
</mousebind>
</context>
<context name="MoveResize">
<mousebind button="Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
</context>
</mouse>
<menu>
<!-- You can specify more than one menu file in here and they are all loaded,
just don't make menu ids clash or, well, it'll be kind of pointless -->
<!-- default menu file (or custom one in $HOME/.config/openbox/) -->
<!-- system menu files on Debian systems -->
<file>/var/lib/openbox/debian-menu.xml</file>
<file>menu.xml</file>
<hideDelay>200</hideDelay>
<!-- if a press-release lasts longer than this setting (in milliseconds), the
menu is hidden again -->
<middle>no</middle>
<!-- center submenus vertically about the parent entry -->
<submenuShowDelay>100</submenuShowDelay>
<!-- time to delay before showing a submenu after hovering over the parent
entry.
if this is a negative value, then the delay is infinite and the
submenu will not be shown until it is clicked on -->
<submenuHideDelay>400</submenuHideDelay>
<!-- time to delay before hiding a submenu when selecting another
entry in parent menu
if this is a negative value, then the delay is infinite and the
submenu will not be hidden until a different submenu is opened -->
<showIcons>yes</showIcons>
<!-- controls if icons appear in the client-list-(combined-)menu -->
<manageDesktops>yes</manageDesktops>
<!-- show the manage desktops section in the client-list-(combined-)menu -->
</menu>
<!--
# this is an example with comments through out. use these to make your
# own rules, but without the comments of course.
# you may use one or more of the name/class/role/title/type rules to specify
# windows to match
<application name="the window's _OB_APP_NAME property (see obxprop)"
class="the window's _OB_APP_CLASS property (see obxprop)"
groupname="the window's _OB_APP_GROUP_NAME property (see obxprop)"
groupclass="the window's _OB_APP_GROUP_CLASS property (see obxprop)"
role="the window's _OB_APP_ROLE property (see obxprop)"
title="the window's _OB_APP_TITLE property (see obxprop)"
type="the window's _OB_APP_TYPE property (see obxprob)..
(if unspecified, then it is 'dialog' for child windows)">
# you may set only one of name/class/role/title/type, or you may use more
# than one together to restrict your matches.
# the name, class, role, and title use simple wildcard matching such as those
# used by a shell. you can use * to match any characters and ? to match
# any single character.
# the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
# or desktop
# when multiple rules match a window, they will all be applied, in the
# order that they appear in this list
# each rule element can be left out or set to 'default' to specify to not
# change that attribute of the window
<decor>yes</decor>
# enable or disable window decorations
<shade>no</shade>
# make the window shaded when it appears, or not
<position force="no">
# the position is only used if both an x and y coordinate are provided
# (and not set to 'default')
# when force is "yes", then the window will be placed here even if it
# says you want it placed elsewhere. this is to override buggy
# applications who refuse to behave
<x>center</x>
# a number like 50, or 'center' to center on screen. use a negative number
# to start from the right (or bottom for <y>), ie -50 is 50 pixels from
# the right edge (or bottom). use 'default' to specify using value
# provided by the application, or chosen by openbox, instead.
<y>200</y>
<monitor>1</monitor>
# specifies the monitor in a xinerama setup.
# 1 is the first head, or 'mouse' for wherever the mouse is
</position>
<size>
# the size to make the window.
<width>20</width>
# a number like 20, or 'default' to use the size given by the application.
# you can use fractions such as 1/2 or percentages such as 75% in which
# case the value is relative to the size of the monitor that the window
# appears on.
<height>30%</height>
</size>
<focus>yes</focus>
# if the window should try be given focus when it appears. if this is set
# to yes it doesn't guarantee the window will be given focus. some
# restrictions may apply, but Openbox will try to
<desktop>1</desktop>
# 1 is the first desktop, 'all' for all desktops
<layer>normal</layer>
# 'above', 'normal', or 'below'
<iconic>no</iconic>
# make the window iconified when it appears, or not
<skip_pager>no</skip_pager>
# asks to not be shown in pagers
<skip_taskbar>no</skip_taskbar>
# asks to not be shown in taskbars. window cycling actions will also
# skip past such windows
<fullscreen>yes</fullscreen>
# make the window in fullscreen mode when it appears
<maximized>true</maximized>
# 'Horizontal', 'Vertical' or boolean (yes/no)
</application>
# end of the example
-->
<applications>
<application title="softhddevice">
<decor>no</decor>
Change rc.xml for openbox to be less restrictive
2017-12-26 20:47:38 +01:00
<maximized>yes</maximized>
fix indentation errors
2017-06-20 16:38:38 +02:00
<!--<skip_pager>yes</skip_pager>-->
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
<skip_taskbar>no</skip_taskbar>
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
</application>
Add rule to rc.xml for vaapidevice
2018-02-12 10:36:04 +01:00
<application title="vaapidevice">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
Add window rule in rc.xml for vdr-sxfe
2017-12-28 15:52:35 +01:00
<application class="VDR">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
fix indentation errors
2017-06-20 16:38:38 +02:00
<application title="browser">
<decor>no</decor>
Change rc.xml for openbox to be less restrictive
2017-12-26 20:47:38 +01:00
<maximized>yes</maximized>
fix indentation errors
2017-06-20 16:38:38 +02:00
<!--<skip_pager>yes</skip_pager>-->
Change rc.xml for openbox to be less restrictive
2017-12-26 20:47:38 +01:00
<skip_taskbar>no</skip_taskbar>
fix indentation errors
2017-06-20 16:38:38 +02:00
</application>
<application title="osd2Web">
<decor>no</decor>
Change rc.xml for openbox to be less restrictive
2017-12-26 20:47:38 +01:00
<maximized>yes</maximized>
fix indentation errors
2017-06-20 16:38:38 +02:00
<!--<skip_pager>yes</skip_pager>-->
Change rc.xml for openbox to be less restrictive
2017-12-26 20:47:38 +01:00
<skip_taskbar>no</skip_taskbar>
fix indentation errors
2017-06-20 16:38:38 +02:00
</application>
</applications>
</openbox_config>
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
Special configuration for openbox on second display do not focus new windows
2018-08-05 13:57:19 +02:00
#+END_SRC
***** rc2.xml
#+BEGIN_SRC xml :tangle roles/yavdr-desktop/templates/openbox/rc2.xml.j2 :mkdirp yes :padline no
<?xml version="1.0" encoding="UTF-8"?>
<openbox_config xmlns="http://openbox.org/3.4/rc" xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- Do not edit this file, it will be overwritten on install.
Copy the file to $HOME/.config/openbox/ instead. -->
<resistance>
<strength>10</strength>
<screen_edge_strength>20</screen_edge_strength>
</resistance>
<focus>
<focusNew>no</focusNew>
<!-- always try to focus new windows when they appear. other rules do
apply -->
<followMouse>no</followMouse>
<!-- move focus to a window when you move the mouse into it -->
<focusLast>yes</focusLast>
<!-- focus the last used window when changing desktops, instead of the one
under the mouse pointer. when followMouse is enabled -->
<underMouse>no</underMouse>
<!-- move focus under the mouse, even when the mouse is not moving -->
<focusDelay>200</focusDelay>
<!-- when followMouse is enabled, the mouse must be inside the window for
this many milliseconds (1000 = 1 sec) before moving focus to it -->
<raiseOnFocus>no</raiseOnFocus>
<!-- when followMouse is enabled, and a window is given focus by moving the
mouse into it, also raise the window -->
</focus>
<placement>
<policy>Smart</policy>
<!-- 'Smart' or 'UnderMouse' -->
<center>yes</center>
<!-- whether to place windows in the center of the free area found or
the top left corner -->
<monitor>Active</monitor>
<!-- with Smart placement on a multi-monitor system, try to place new windows
on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
the active window is, 'Primary' - only on the primary monitor -->
<primaryMonitor>Active</primaryMonitor>
<!-- The monitor where Openbox should place popup dialogs such as the
focus cycling popup, or the desktop switch popup. It can be an index
from 1, specifying a particular monitor. Or it can be one of the
following: 'Mouse' - where the mouse is, or
'Active' - where the active window is -->
</placement>
<theme>
<name>Onyx</name>
<titleLayout>NLIMC</titleLayout>
<!--
available characters are NDSLIMC, each can occur at most once.
N: window icon
L: window label (AKA title).
I: iconify
M: maximize
C: close
S: shade (roll up/down)
D: omnipresent (on all desktops).
-->
<keepBorder>no</keepBorder>
<animateIconify>yes</animateIconify>
<font place="ActiveWindow">
<name>sans</name>
<size>8</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="InactiveWindow">
<name>sans</name>
<size>8</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="MenuHeader">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>normal</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="MenuItem">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>normal</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="ActiveOnScreenDisplay">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
<font place="InactiveOnScreenDisplay">
<name>sans</name>
<size>9</size>
<!-- font size in points -->
<weight>bold</weight>
<!-- 'bold' or 'normal' -->
<slant>normal</slant>
<!-- 'italic' or 'normal' -->
</font>
</theme>
<desktops>
<!-- this stuff is only used at startup, pagers allow you to change them
during a session
these are default values to use when other ones are not already set
by other applications, or saved in your session
use obconf if you want to change these without having to log out
and back in -->
<number>2</number>
<firstdesk>1</firstdesk>
<names>
<!-- set names up here if you want to, like this:
<name>desktop 1</name>
<name>desktop 2</name>
-->
</names>
<popupTime>875</popupTime>
<!-- The number of milliseconds to show the popup for when switching
desktops. Set this to 0 to disable the popup. -->
</desktops>
<resize>
<drawContents>yes</drawContents>
<popupShow>Nonpixel</popupShow>
<!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
<popupPosition>Center</popupPosition>
<!-- 'Center', 'Top', or 'Fixed' -->
<popupFixedPosition>
<!-- these are used if popupPosition is set to 'Fixed' -->
<x>10</x>
<!-- positive number for distance from left edge, negative number for
distance from right edge, or 'Center' -->
<y>10</y>
<!-- positive number for distance from top edge, negative number for
distance from bottom edge, or 'Center' -->
</popupFixedPosition>
</resize>
<!-- You can reserve a portion of your screen where windows will not cover when
they are maximized, or when they are initially placed.
Many programs reserve space automatically, but you can use this in other
cases. -->
<margins>
<top>0</top>
<bottom>0</bottom>
<left>0</left>
<right>0</right>
</margins>
<dock>
<position>TopLeft</position>
<!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
<floatingX>0</floatingX>
<floatingY>0</floatingY>
<noStrut>no</noStrut>
<stacking>Above</stacking>
<!-- 'Above', 'Normal', or 'Below' -->
<direction>Vertical</direction>
<!-- 'Vertical' or 'Horizontal' -->
<autoHide>no</autoHide>
<hideDelay>300</hideDelay>
<!-- in milliseconds (1000 = 1 second) -->
<showDelay>300</showDelay>
<!-- in milliseconds (1000 = 1 second) -->
<moveButton>Middle</moveButton>
<!-- 'Left', 'Middle', 'Right' -->
</dock>
<keyboard>
<chainQuitKey>C-g</chainQuitKey>
<!-- Keybindings for desktop switching -->
<keybind key="C-A-Left">
<action name="GoToDesktop">
<to>left</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="C-A-Right">
<action name="GoToDesktop">
<to>right</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="C-A-Up">
<action name="GoToDesktop">
<to>up</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="C-A-Down">
<action name="GoToDesktop">
<to>down</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Left">
<action name="SendToDesktop">
<to>left</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Right">
<action name="SendToDesktop">
<to>right</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Up">
<action name="SendToDesktop">
<to>up</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="S-A-Down">
<action name="SendToDesktop">
<to>down</to>
<wrap>no</wrap>
</action>
</keybind>
<keybind key="W-F1">
<action name="GoToDesktop">
<to>1</to>
</action>
</keybind>
<keybind key="W-F2">
<action name="GoToDesktop">
<to>2</to>
</action>
</keybind>
<keybind key="W-F3">
<action name="GoToDesktop">
<to>3</to>
</action>
</keybind>
<keybind key="W-F4">
<action name="GoToDesktop">
<to>4</to>
</action>
</keybind>
<keybind key="W-d">
<action name="ToggleShowDesktop"/>
</keybind>
<!-- Keybindings for windows -->
<keybind key="A-F4">
<action name="Close"/>
</keybind>
<keybind key="A-Escape">
<action name="Lower"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
</keybind>
<keybind key="A-space">
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
</keybind>
<!-- Take a screenshot of the current window with scrot when Alt+Print are pressed -->
<keybind key="A-Print">
<action name="Execute">
<command>scrot -s</command>
</action>
</keybind>
<!-- Keybindings for window switching -->
<keybind key="A-Tab">
<action name="NextWindow">
<finalactions>
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</finalactions>
</action>
</keybind>
<keybind key="A-S-Tab">
<action name="PreviousWindow">
<finalactions>
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</finalactions>
</action>
</keybind>
<keybind key="C-A-Tab">
<action name="NextWindow">
<panels>yes</panels>
<desktop>yes</desktop>
<finalactions>
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</finalactions>
</action>
</keybind>
<!-- Keybindings for window switching with the arrow keys -->
<keybind key="W-S-Right">
<action name="DirectionalCycleWindows">
<direction>right</direction>
</action>
</keybind>
<keybind key="W-S-Left">
<action name="DirectionalCycleWindows">
<direction>left</direction>
</action>
</keybind>
<keybind key="W-S-Up">
<action name="DirectionalCycleWindows">
<direction>up</direction>
</action>
</keybind>
<keybind key="W-S-Down">
<action name="DirectionalCycleWindows">
<direction>down</direction>
</action>
</keybind>
</keyboard>
<mouse>
<dragThreshold>1</dragThreshold>
<!-- number of pixels the mouse must move before a drag begins -->
<doubleClickTime>500</doubleClickTime>
<!-- in milliseconds (1000 = 1 second) -->
<screenEdgeWarpTime>400</screenEdgeWarpTime>
<!-- Time before changing desktops when the pointer touches the edge of the
screen while moving a window, in milliseconds (1000 = 1 second).
Set this to 0 to disable warping -->
<screenEdgeWarpMouse>false</screenEdgeWarpMouse>
<!-- Set this to TRUE to move the mouse pointer across the desktop when
switching due to hitting the edge of the screen -->
<context name="Frame">
<mousebind button="A-Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="A-Left" action="Click">
<action name="Unshade"/>
</mousebind>
<mousebind button="A-Left" action="Drag">
<action name="Move"/>
</mousebind>
<mousebind button="A-Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="A-Right" action="Drag">
<action name="Resize"/>
</mousebind>
<mousebind button="A-Middle" action="Press">
<action name="Lower"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
</mousebind>
<mousebind button="A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="C-A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="C-A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="A-S-Up" action="Click">
<action name="SendToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="A-S-Down" action="Click">
<action name="SendToDesktop">
<to>next</to>
</action>
</mousebind>
</context>
<context name="Titlebar">
<mousebind button="Left" action="Drag">
<action name="Move"/>
</mousebind>
<mousebind button="Left" action="DoubleClick">
<action name="ToggleMaximize"/>
</mousebind>
<mousebind button="Up" action="Click">
<action name="if">
<shaded>no</shaded>
<then>
<action name="Shade"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
<action name="Lower"/>
</then>
</action>
</mousebind>
<mousebind button="Down" action="Click">
<action name="if">
<shaded>yes</shaded>
<then>
<action name="Unshade"/>
<action name="Raise"/>
</then>
</action>
</mousebind>
</context>
<context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Middle" action="Press">
<action name="Lower"/>
<action name="FocusToBottom"/>
<action name="Unfocus"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
</mousebind>
</context>
<context name="Top">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>top</edge>
</action>
</mousebind>
</context>
<context name="Left">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>left</edge>
</action>
</mousebind>
</context>
<context name="Right">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>right</edge>
</action>
</mousebind>
</context>
<context name="Bottom">
<mousebind button="Left" action="Drag">
<action name="Resize">
<edge>bottom</edge>
</action>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
</mousebind>
</context>
<context name="TRCorner BRCorner TLCorner BLCorner">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Drag">
<action name="Resize"/>
</mousebind>
</context>
<context name="Client">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Middle" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
</context>
<context name="Icon">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="ShowMenu">
<menu>client-menu</menu>
</action>
</mousebind>
</context>
<context name="AllDesktops">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="ToggleOmnipresent"/>
</mousebind>
</context>
<context name="Shade">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="ToggleShade"/>
</mousebind>
</context>
<context name="Iconify">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="Iconify"/>
</mousebind>
</context>
<context name="Maximize">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Middle" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="ToggleMaximize"/>
</mousebind>
<mousebind button="Middle" action="Click">
<action name="ToggleMaximize">
<direction>vertical</direction>
</action>
</mousebind>
<mousebind button="Right" action="Click">
<action name="ToggleMaximize">
<direction>horizontal</direction>
</action>
</mousebind>
</context>
<context name="Close">
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
<action name="Unshade"/>
</mousebind>
<mousebind button="Left" action="Click">
<action name="Close"/>
</mousebind>
</context>
<context name="Desktop">
<mousebind button="Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="C-A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="C-A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="Left" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
<mousebind button="Right" action="Press">
<action name="Focus"/>
<action name="Raise"/>
</mousebind>
</context>
<context name="Root">
<!-- Menus -->
<mousebind button="Middle" action="Press">
<action name="ShowMenu">
<menu>client-list-combined-menu</menu>
</action>
</mousebind>
<mousebind button="Right" action="Press">
<action name="ShowMenu">
<menu>root-menu</menu>
</action>
</mousebind>
</context>
<context name="MoveResize">
<mousebind button="Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
<mousebind button="A-Up" action="Click">
<action name="GoToDesktop">
<to>previous</to>
</action>
</mousebind>
<mousebind button="A-Down" action="Click">
<action name="GoToDesktop">
<to>next</to>
</action>
</mousebind>
</context>
</mouse>
<menu>
<!-- You can specify more than one menu file in here and they are all loaded,
just don't make menu ids clash or, well, it'll be kind of pointless -->
<!-- default menu file (or custom one in $HOME/.config/openbox/) -->
<!-- system menu files on Debian systems -->
<file>/var/lib/openbox/debian-menu.xml</file>
<file>menu.xml</file>
<hideDelay>200</hideDelay>
<!-- if a press-release lasts longer than this setting (in milliseconds), the
menu is hidden again -->
<middle>no</middle>
<!-- center submenus vertically about the parent entry -->
<submenuShowDelay>100</submenuShowDelay>
<!-- time to delay before showing a submenu after hovering over the parent
entry.
if this is a negative value, then the delay is infinite and the
submenu will not be shown until it is clicked on -->
<submenuHideDelay>400</submenuHideDelay>
<!-- time to delay before hiding a submenu when selecting another
entry in parent menu
if this is a negative value, then the delay is infinite and the
submenu will not be hidden until a different submenu is opened -->
<showIcons>yes</showIcons>
<!-- controls if icons appear in the client-list-(combined-)menu -->
<manageDesktops>yes</manageDesktops>
<!-- show the manage desktops section in the client-list-(combined-)menu -->
</menu>
<!--
# this is an example with comments through out. use these to make your
# own rules, but without the comments of course.
# you may use one or more of the name/class/role/title/type rules to specify
# windows to match
<application name="the window's _OB_APP_NAME property (see obxprop)"
class="the window's _OB_APP_CLASS property (see obxprop)"
groupname="the window's _OB_APP_GROUP_NAME property (see obxprop)"
groupclass="the window's _OB_APP_GROUP_CLASS property (see obxprop)"
role="the window's _OB_APP_ROLE property (see obxprop)"
title="the window's _OB_APP_TITLE property (see obxprop)"
type="the window's _OB_APP_TYPE property (see obxprob)..
(if unspecified, then it is 'dialog' for child windows)">
# you may set only one of name/class/role/title/type, or you may use more
# than one together to restrict your matches.
# the name, class, role, and title use simple wildcard matching such as those
# used by a shell. you can use * to match any characters and ? to match
# any single character.
# the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
# or desktop
# when multiple rules match a window, they will all be applied, in the
# order that they appear in this list
# each rule element can be left out or set to 'default' to specify to not
# change that attribute of the window
<decor>yes</decor>
# enable or disable window decorations
<shade>no</shade>
# make the window shaded when it appears, or not
<position force="no">
# the position is only used if both an x and y coordinate are provided
# (and not set to 'default')
# when force is "yes", then the window will be placed here even if it
# says you want it placed elsewhere. this is to override buggy
# applications who refuse to behave
<x>center</x>
# a number like 50, or 'center' to center on screen. use a negative number
# to start from the right (or bottom for <y>), ie -50 is 50 pixels from
# the right edge (or bottom). use 'default' to specify using value
# provided by the application, or chosen by openbox, instead.
<y>200</y>
<monitor>1</monitor>
# specifies the monitor in a xinerama setup.
# 1 is the first head, or 'mouse' for wherever the mouse is
</position>
<size>
# the size to make the window.
<width>20</width>
# a number like 20, or 'default' to use the size given by the application.
# you can use fractions such as 1/2 or percentages such as 75% in which
# case the value is relative to the size of the monitor that the window
# appears on.
<height>30%</height>
</size>
<focus>yes</focus>
# if the window should try be given focus when it appears. if this is set
# to yes it doesn't guarantee the window will be given focus. some
# restrictions may apply, but Openbox will try to
<desktop>1</desktop>
# 1 is the first desktop, 'all' for all desktops
<layer>normal</layer>
# 'above', 'normal', or 'below'
<iconic>no</iconic>
# make the window iconified when it appears, or not
<skip_pager>no</skip_pager>
# asks to not be shown in pagers
<skip_taskbar>no</skip_taskbar>
# asks to not be shown in taskbars. window cycling actions will also
# skip past such windows
<fullscreen>yes</fullscreen>
# make the window in fullscreen mode when it appears
<maximized>true</maximized>
# 'Horizontal', 'Vertical' or boolean (yes/no)
</application>
# end of the example
-->
<applications>
<application title="softhddevice">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
<application title="vaapidevice">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
<application class="VDR">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
<application title="browser">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
<application title="osd2Web">
<decor>no</decor>
<maximized>yes</maximized>
<!--<skip_pager>yes</skip_pager>-->
<skip_taskbar>no</skip_taskbar>
</application>
</applications>
</openbox_config>
merge
2017-05-12 18:21:26 +02:00
#+END_SRC
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
**** Systemd User Session
***** yavdr-desktop.target
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/systemd/user/yavdr-desktop.target.j2 :mkdirp yes :padline no
[Unit]
Description=yaVDR Desktop
Requires=default.target
After=default.target pulseaudio.service
Wants=dbus.service pulseaudio.service
AllowIsolate=yes
#+END_SRC
***** detect-second-display
#+BEGIN_SRC conf :tangle roles/yavdr-desktop/templates/systemd/user/detect-second-display.service.j2 :mkdirp yes :padline no
[Unit]
Description=Detect second DISPLAY using xrandr
[Service]
Type=oneshot
ExecStart=/bin/bash -c 'export DISPLAY=$DISPLAY.1; xrandr -q | grep "connected" && echo "DISPLAY=$DISPLAY" > ~/.second_display || rm -f ~/.second_display'
[Install]
WantedBy=yavdr-desktop.target
#+END_SRC
***** openbox-second.service
#+BEGIN_SRC conf :tangle roles/yavdr-desktop/templates/systemd/user/openbox-second.service.j2 :mkdirp yes :padline no
[Unit]
Description=Start openbox on the second DISPLAY if it exists
After=detect-second-display.service
Wants=detect-second-display.service
Before=yavdr-frontend.service
ConditionFileNotEmpty=%h/.second_display
[Service]
EnvironmentFile=%h/.second_display
Special configuration for openbox on second display do not focus new windows
2018-08-05 13:57:19 +02:00
ExecStart=/usr/bin/openbox --config-file %h/.config/openbox/rc2.xml
Disable dpms for second display
2018-05-18 10:34:16 +02:00
ExecStartPost=/usr/bin/xset -dpms s off -display $DISPLAY
Create own role for yavdr-desktop
2018-02-12 08:48:12 +01:00
ExecStartPost=/bin/bash %h/.fehbg
[Install]
WantedBy=yavdr-desktop.target
#+END_SRC
***** osd2web.service
#+BEGIN_SRC conf :tangle roles/yavdr-desktop/templates/systemd/user/osd2web.service.j2 :mkdirp yes :padline no
[Unit]
Description=Start a kiosk browser on the second DISPLAY if it exists
After=detect-second-display.service openbox-second.service
Wants=detect-second-display.service openbox-second.service
ConditionFileNotEmpty=%h/.second_display
[Service]
EnvironmentFile=%h/.second_display
Environment=url="http://localhost:4444/skins/horchiTft/index.html?theme=anthraize&onlyView=1"
Environment=browser="kiosk-browser"
EnvironmentFile=-%h/.config/osd2web/config
ExecStart=/usr/bin/on_vdr -o -c '${browser} "${url}"'
KillSignal=SIGINT
[Install]
WantedBy=yavdr-desktop.target
#+END_SRC
***** tmux.service
#+BEGIN_SRC conf :tangle roles/yavdr-desktop/templates/systemd/user/tmux.service.j2 :mkdirp yes :padline no
[Unit]
Description=Start tmux in detached session
[Service]
EnvironmentFile=-%h/.session-env
Type=forking
ExecStart=/usr/bin/tmux new-session -s use-session -d
ExecStop=/usr/bin/tmux kill-session -t %u
Restart=always
[Install]
WantedBy=default.target
#+END_SRC
***** wm-exit.service
#+BEGIN_SRC conf :tangle roles/yavdr-desktop/templates/systemd/user/wm-exit.service.j2 :mkdirp yes :padline no
[Unit]
Description=exit window manager gracefully
[Service]
ExecStart=/bin/true
ExecStop=/usr/bin/openbox --exit
RemainAfterExit=True
[Install]
WantedBy=default.target
#+END_SRC
**** irexec
irexec.service starts irexec for the user session
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/systemd/user/irexec.service.j2 :mkdirp yes :padline no
[Unit]
Description=LIRC command handler
[Service]
Type=simple
ExecStart=/usr/bin/irexec %h/.lircrc
[Install]
WantedBy=yavdr-desktop.target
#+END_SRC
~/.lircrc contains the irexec configuration
#+BEGIN_SRC shell :tangle roles/yavdr-desktop/templates/.lircrc.j2 :mkdirp yes :padline no
begin
prog = irexec
button = KEY_HOME
config = frontend-dbus-send switchbetween kodi vdr
end
#+END_SRC
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
** samba-install
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/samba-install/tasks/main.yml :mkdirp yes :padline no
---
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# file: roles/samba-install/tasks/main.yml
- name: install samba server
apt:
name: '{{ item }}'
state: present
install_recommends: no
with_items:
- samba
- samba-common
- samba-common-bin
- tdb-tools
#+END_SRC
** samba-config
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/samba-config/tasks/main.yml :mkdirp yes :padline no
---
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
# file: roles/samba-config/tasks/main.yml
# TODO:
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
# - name: divert original smbd.conf
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
- name: touch smb.conf.custom
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
file:
state: touch
dest: '/etc/samba/smb.conf.custom'
notify: [ 'Restart Samba' ]
- name: expand template for smb.conf
template:
src: 'templates/smb.conf.j2'
dest: '/etc/samba/smb.conf'
#validate: 'testparm -s %s'
notify: [ 'Restart Samba' ]
#+END_SRC
*** templates
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
**** smb.conf
***** global settings
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/samba-config/templates/smb.conf.j2 :mkdirp yes :padline no
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
#======================= Global Settings =======================
[global]
## Browsing/Identification ###
# Change this to the workgroup/NT-domain name your Samba server will part of
workgroup = {{ samba.workgroup }}
# server string is the equivalent of the NT Description field
server string = %h server (Samba, Ubuntu)
# This will prevent nmbd to search for NetBIOS names through DNS.
dns proxy = no
#### Debugging/Accounting ####
# This tells Samba to use a separate log file for each machine
# that connects
log file = /var/log/samba/log.%m
# Cap the size of the individual log files (in KiB).
max log size = 1000
# We want Samba to log a minimum amount of information to syslog. Everything
# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
# through syslog you should set the following parameter to something higher.
syslog = 0
# Do something sensible when Samba crashes: mail the admin a backtrace
panic action = /usr/share/samba/panic-action %d
####### Authentication #######
# "security = user" is always a good idea. This will require a Unix account
# in this server for every user accessing the server. See
# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
# in the samba-doc package for details.
# security = user
# You may wish to use password encryption. See the section on
# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
encrypt passwords = true
# If you are using encrypted passwords, Samba will need to know what
# password database type you are using.
passdb backend = tdbsam
obey pam restrictions = yes
# This boolean parameter controls whether Samba attempts to sync the Unix
# password with the SMB password when the encrypted SMB password in the
# passdb is changed.
unix password sync = yes
# For Unix password sync to work on a Debian GNU/Linux system, the following
# parameters must be set (thanks to Ian Kahan <<kahan@informatik.tu-muenchen.de> for
# sending the correct chat script for the passwd program in Debian Sarge).
passwd program = /usr/bin/passwd %u
passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
# This boolean controls whether PAM will be used for password changes
# when requested by an SMB client instead of the program listed in
# 'passwd program'. The default is 'no'.
pam password change = yes
# This option controls how unsuccessful authentication attempts are mapped
# to anonymous connections
map to guest = bad user
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
{% if samba.windows_compatible %}
# disable unix extensions and enable following symlinks
unix extensions = no
follow symlinks= yes
wide links= yes
{% endif %}
#+END_SRC
***** media directories
#+BEGIN_SRC yaml :tangle roles/samba-config/templates/smb.conf.j2 :mkdirp yes
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
{% for name, path in media_dirs.iteritems() %}
[{{ name }}]
path = {{ path }}
comment = {{ name }} on %h
guest ok = yes
writeable = yes
browseable = yes
create mode = 0664
directory mode = 0775
force user = {{ vdr.user }}
force group = {{ vdr.group }}
follow symlinks = yes
wide links = yes
{% endfor %}
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
#+END_SRC
***** include custom samba exports
#+BEGIN_SRC yaml :tangle roles/samba-config/templates/smb.conf.j2 :mkdirp yes
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
include = /etc/samba/smb.conf.custom
#+END_SRC
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
** STARTED autoinstall-drivers
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
It would be nice to be able to detect if it is suitable to install those drivers:
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
*** TODO sundtek for Sundtek devices (local or network connection)
fix some roles, change order of role execution in playbook
2017-03-13 22:25:32 +01:00
Vendor-IDs:
- eb1a:5[1b2] (alte Generation)
- 2659:* (neuere Sticks)
Special configuration for openbox on second display do not focus new windows
2018-08-05 13:57:19 +02:00
**** planned packages
- yavdr-hardware-sundtek
- python3-sundtek
- yavdr-backend-sundtek
Install eventlircd after lircd has been stopped
2018-05-06 16:32:39 +02:00
*** TODO drivers for TT S2-6400 FF
https://github.com/s-moch/linux-saa716x - kann man den relevanten Teil als dkms-Paket bauen?
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
** 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.
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-ubuntu-drivers/tasks/main.yml :padline no
fix indentation errors
2017-06-20 16:38:38 +02:00
---
# file roles/autoinstall-ubuntu-drivers/tasks/main.yml
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
Add additional files
2017-11-22 10:09:51 +01:00
- name: autoinstall ubuntu-drivers-common
block:
- name: apt | install ubuntu-drivers-common
apt:
name: ubuntu-drivers-common
state: present
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
allow action to fail if file does not exist
2017-11-22 10:56:21 +01:00
- name: use ubuntu-drivers to install additional drivers automatically
Add additional files
2017-11-22 10:09:51 +01:00
command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall
Do not run ubuntu-drivers autoinstall if system is a VirtualBox Client
2018-04-19 11:55:03 +02:00
when: (ansible_virtualization_type != "virtualbox" and ansible_virtualization_role != "guest")
Fix condition to ubuntu-drivers autoinstall
2017-12-16 18:58:57 +01:00
# ubuntu-drivers-common tries to autoinstall
Do not run ubuntu-drivers autoinstall if system is a VirtualBox Client
2018-04-19 11:55:03 +02:00
# conflicting packages for virtualbox in Ubuntu 16.04 and 18.04 :(
Add additional files
2017-11-22 10:09:51 +01:00
#+END_SRC
** autoinstall-virtualbox-guest
This role installs the guest additions for virtualbox guests on Ubuntu 16.04
#+BEGIN_SRC yaml :tangle roles/autoinstall-virtualbox-guest/tasks/main.yml :padline no
---
# file roles/autoinstall-virtualbox-guest/tasks/main.yml
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
Add additional files
2017-11-22 10:09:51 +01:00
- name: install virtualbox guest additions
block:
- name: install packages
apt:
state: present
name: '{{ item }}'
with_items:
- dkms
Install *-hwe virtualbox packages by default
2018-04-19 12:06:43 +02:00
- virtualbox-guest-x11-hwe
- virtualbox-guest-dkms-hwe
- virtualbox-guest-x11-hwe
allow action to fail if file does not exist
2017-11-22 10:56:21 +01:00
# TODO: set xineliboutput as frontend
Add additional files
2017-11-22 10:09:51 +01:00
when:
- ansible_virtualization_type == "virtualbox"
- ansible_virtualization_role == "guest"
- ansible_distribution == "Ubuntu"
Set xineliboutput as output plugin for virtualbox
2018-02-12 16:37:41 +01:00
- name: set xineliboutput as frontend
Install xineliboutput and vdr-sxfe if we got a virtualbox environment
2018-02-12 16:40:58 +01:00
block:
- apt:
name: '{{ item }}'
state: present
with_items:
- vdr-plugin-xineliboutput
- xineliboutput-sxfe
- command: '{{ item }}'
with_items:
- vdrctl disable softhddevice
- vdrctl disable vaapidevice
- vdrctl disable xine
- vdrctl disable pvr350
- vdrctl enable xineliboutput
ignore_errors: yes
Set xineliboutput as output plugin for virtualbox
2018-02-12 16:37:41 +01:00
when:
Rearrange Installation of xineliboutput when a VM is detected
2018-09-04 13:21:32 +02:00
- ansible_virtualization_type == "virtualbox" or ansible_virtualization_type == "VMware"
Set xineliboutput as output plugin for virtualbox
2018-02-12 16:37:41 +01:00
- ansible_virtualization_role == "guest"
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
#+END_SRC
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
** autoinstall-atric-usb
*** dependencies
Add dependency to yavdr-remote role for autoinstall-atric-usb
2018-01-01 22:53:47 +01:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-atric-usb/meta/main.yml :padline no
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
---
dependencies:
Add dependency to collect-facts
2018-01-16 12:06:02 +01:00
- { role: collect-facts }
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
- { role: yavdr-remote }
#+END_SRC
*** tasks
#+BEGIN_SRC yaml :tangle roles/autoinstall-atric-usb/tasks/main.yml :padline no
---
# file roles/autoinstall-atric-usb/tasks/main.yml
- name: install and configure Atric IR-WakeupUSB
block:
- name: apt | install lirc-drv-irman
Fix apt task
2018-01-01 22:54:47 +01:00
apt:
name: lirc-drv-irman
state: present
configure systemd properties for all needed service- and socket-Units also add more tags to the role
2018-01-05 10:57:31 +01:00
tags:
- packages
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
- name: write lirc configuration
Fix indentation
2018-01-01 22:55:59 +01:00
template:
Fix name and destination for lirc options file
2018-01-01 23:02:40 +01:00
src: templates/lirc_options.conf.j2
dest: /etc/lirc/lirc_options.conf
configure systemd properties for all needed service- and socket-Units also add more tags to the role
2018-01-05 10:57:31 +01:00
tags:
- config
- systemd
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
configure systemd properties for all needed service- and socket-Units also add more tags to the role
2018-01-05 10:57:31 +01:00
- name: enable lircd, eventlircd, lircd2uinput
Fix indentation
2018-01-01 22:55:59 +01:00
systemd:
configure systemd properties for all needed service- and socket-Units also add more tags to the role
2018-01-05 10:57:31 +01:00
name: '{{ item }}'
Fix indentation
2018-01-01 22:55:59 +01:00
enabled: yes
state: started
masked: no
daemon_reload: yes
configure systemd properties for all needed service- and socket-Units also add more tags to the role
2018-01-05 10:57:31 +01:00
with_items:
Update Manual.org and Manual.html
2018-01-07 17:35:04 +01:00
- eventlircd.service
configure systemd properties for all needed service- and socket-Units also add more tags to the role
2018-01-05 10:57:31 +01:00
- lircd2uinput.service
- lircd.service
tags:
- systemd
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
Fix USB IDs, add new role to playbook yavdr07.yml
2018-01-16 09:12:11 +01:00
when: '"04d8:f844" in usb'
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
#+END_SRC
*** templates
Fix name and destination for lirc options file
2018-01-01 23:02:40 +01:00
#+BEGIN_SRC conf :tangle roles/autoinstall-atric-usb/templates/lirc_options.conf.j2 :padline no
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
[lircd]
nodaemon = False
driver = irman
device = /dev/irman
output = /var/run/lirc/lircd0
pidfile = /var/run/lirc/lircd0.pid
plugindir = /usr/lib/x86_64-linux-gnu/lirc/plugins
permission = 666
allow-simulate = No
repeat-max = 600
#loglevel = 6
#release = true
#release_suffix = _EVUP
#logfile = ...
#driver-options = ...
Add role autoinstall-yausbir
2018-01-16 09:05:08 +01:00
[lircmd]
uinput = False
nodaemon = False
#+END_SRC
** autoinstall-yausbir
*** dependencies
#+BEGIN_SRC yaml :tangle roles/autoinstall-yausbir/meta/main.yml :padline no
---
dependencies:
- { role: yavdr-remote }
#+END_SRC
*** tasks
#+BEGIN_SRC yaml :tangle roles/autoinstall-yausbir/tasks/main.yml :padline no
---
# file roles/autoinstall-atric-usb/tasks/main.yml
- name: install and configure Atric IR-WakeupUSB
block:
- name: apt | install lirc-drv-yausbir
apt:
name: lirc-drv-yausbir
state: present
tags:
- packages
- name: write lirc configuration
template:
src: templates/lirc_options.conf.j2
dest: /etc/lirc/lirc_options.conf
tags:
- config
- systemd
- name: enable lircd, eventlircd, lircd2uinput
systemd:
name: '{{ item }}'
enabled: yes
state: started
masked: no
daemon_reload: yes
with_items:
- eventlircd.service
- lircd2uinput.service
- lircd.service
tags:
- systemd
Fix USB IDs, add new role to playbook yavdr07.yml
2018-01-16 09:12:11 +01:00
when: '"10c4:876c" in usb'
Add role autoinstall-yausbir
2018-01-16 09:05:08 +01:00
#+END_SRC
*** templates
#+BEGIN_SRC conf :tangle roles/autoinstall-yausbir/templates/lirc_options.conf.j2 :padline no
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
Add role autoinstall-yausbir
2018-01-16 09:05:08 +01:00
[lircd]
nodaemon = False
Fix driver name for yausbir: ya_usbir
2018-01-16 09:14:45 +01:00
driver = ya_usbir
Add role autoinstall-yausbir
2018-01-16 09:05:08 +01:00
output = /var/run/lirc/lircd0
pidfile = /var/run/lirc/lircd0.pid
plugindir = /usr/lib/x86_64-linux-gnu/lirc/plugins
permission = 666
allow-simulate = No
repeat-max = 600
#loglevel = 6
#release = true
#release_suffix = _EVUP
#logfile = ...
#driver-options = ...
add tags to yavdr-remote, add autoinstall-atric-usb role
2018-01-01 22:39:10 +01:00
[lircmd]
uinput = False
nodaemon = False
#+END_SRC
rename fact files
2017-03-02 09:38:05 +01:00
** autoinstall-satip
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
If a Sat>IP Server responds to a discovery request, the package vdr-plugin-satip is installed.
rename fact files
2017-03-02 09:38:05 +01:00
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-satip/tasks/main.yml :padline no
rename fact files
2017-03-02 09:38:05 +01:00
---
# file roles/autoinstall-satip/tasks/main.yml
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
- name: "detect SAT>IP Server(s) on the network"
action: satip_facts
- debug:
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
var: satip_devices
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
verbosity: 1
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
- name: apt | install vdr-plugin-satip if a Sat>IP server has been detected
rename fact files
2017-03-02 09:38:05 +01:00
apt:
name: vdr-plugin-satip
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
state: present
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: satip_devices
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
notify: [ 'Restart VDR' ]
rename fact files
2017-03-02 09:38:05 +01:00
#+END_SRC
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
** autoinstall-targavfd
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-targavfd/tasks/main.yml :padline no
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
---
# file roles/autoinstall-targavfd/tasks/main.yml
- name: apt | install vdr-plugin-targavfd if connected
apt:
name: vdr-plugin-targavfd
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: '"19c2:6a11" in usb'
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
notify: [ 'Restart VDR' ]
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
#+END_SRC
** autoinstall-imonlcd
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-imonlcd/tasks/main.yml :padline no
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
---
# file roles/autoinstall-imonlcd/tasks/main.yml
- name: apt | install vdr-plugin-imonlcd if connected
apt:
name: vdr-plugin-imonlcd
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: '"15c2:0038" in usb or "15c2:ffdc" in usb'
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
notify: [ 'Restart VDR' ]
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
#+END_SRC
** autoinstall-libcecdaemon
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-libcecdaemon/tasks/main.yml :padline no
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
---
# file roles/autoinstall-libcec-daemon/tasks/main.yml
- name: apt | install libcec-daemon if connected
apt:
name: libcec-daemon
when:
Fix quoting for hardware detection conditions
2017-08-31 15:55:04 +02:00
- "2548:1002" in usb
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
#+END_SRC
** autoinstall-pvr350
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-pvr350/tasks/main.yml :padline no
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
---
# file roles/autoinstall-pvr350/tasks/main.yml
- name: apt | install vdr-plugin-pvr350 if connected
apt:
name: vdr-plugin-pvr350
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: '"0070:4000" in pci'
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
notify: [ 'Restart VDR' ]
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
#+END_SRC
add role to install pvrinput for some cards
2017-07-30 23:33:22 +02:00
** autoinstall-hauppauge-pvr
#+BEGIN_SRC yaml :tangle roles/autoinstall-hauppauge-pvr/tasks/main.yml :padline no
---
# file roles/autoinstall-hauppauge-pvr/tasks/main.yml
- name: apt | install vdr-plugin-pvrinput if a haupauge pvr card is found
apt:
name: vdr-plugin-pvrinput
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: '"0070:4000" in pci or "4444:0016" in pci'
add role to install pvrinput for some cards
2017-07-30 23:33:22 +02:00
notify: [ 'Restart VDR' ]
Update
2017-07-30 23:53:19 +02:00
#+END_SRC
Add role to download and install firmware files
2018-01-16 10:07:18 +01:00
** autoinstall-firmware
Add dependency to collect-facts
2018-01-16 12:06:02 +01:00
*** dependencies
#+BEGIN_SRC yaml :tangle roles/autoinstall-firmware/meta/main.yml :padline no
---
dependencies:
- { role: collect-facts }
#+END_SRC
*** tasks
Add role to download and install firmware files
2018-01-16 10:07:18 +01:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-firmware/tasks/main.yml :padline no
---
# This role provides easyily downloadable firmware files
Update Manual.org and Manual.html
2018-08-10 08:13:55 +02:00
- name: Firmware dvb-demod-si2168-b40-01.fw for Hauppauge WinTV HD Solo/Duo, PCTV 292e
Add role to download and install firmware files
2018-01-16 10:07:18 +01:00
get_url:
url: https://github.com/OpenELEC/dvb-firmware/raw/master/firmware/dvb-demod-si2168-b40-01.fw
checksum: sha256:8507536630d75a316d0719d6b95c04b90c36baa5b457ad457c9bacadafcef134
dest: /lib/firmware/dvb-demod-si2168-b40-01.fw
when: '"2040:0264" in usb or "2013:025f" in usb'
Update Manual.org and Manual.html
2018-08-10 08:13:55 +02:00
- name: Firmware dvb-fe-xc5000-1.6.114.fw for Hauppauge WinTV-HVR-930C
Add role to download and install firmware files
2018-01-16 10:07:18 +01:00
get_url:
url: https://github.com/OpenELEC/dvb-firmware/raw/master/firmware/dvb-fe-xc5000-1.6.114.fw
checksum: sha256:7104bda8df301fe1bd4c09de1708aeb6d0d8e1f9d55505449fecfad82639235f
dest: /lib/firmware/dvb-fe-xc5000-1.6.114.fw
when: '"2040:1605" in usb'
Update Manual.org and Manual.html
2018-08-10 08:13:55 +02:00
- name: Firmware ngenge_18.fw for ngene cards
get_url:
url: http://l4m-daten.de/downloads/firmware/dvb-s2/linux/all/ngene_18.fw
checksum: sha256:213d98ec2cd575eba15d82ee79fed7098e670de43792f8aa773a95cfb7c32060
dest: /lib/firmware/ngene_18.fw
when: '"ngene" in modules'
notify: reboot required
- name: Firmware drxk_a3.mc for drxk
get_url:
url: https://github.com/OpenELEC/dvb-firmware/raw/master/firmware/drxk_a3.mc
checksum: sha256:f8956ad6f92a4ce90a6ab94ed23e2f9a27e9317e936fd3e0119778dd28e7e294
dest: /lib/firmware/drxk_a3.mc
when: '"ngene" in modules or "drxk" in modules'
notify: reboot required
Add role to download and install firmware files
2018-01-16 10:07:18 +01:00
#+END_SRC
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
** autoinstall-dvbsky-firmware
Add dependency to collect-facts
2018-01-16 12:06:02 +01:00
*** dependencies
#+BEGIN_SRC yaml :tangle roles/autoinstall-dvbsky-firmware/meta/main.yml :padline no
---
dependencies:
- { role: collect-facts }
#+END_SRC
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
*** defaults
#+INCLUDE: "roles/autoinstall-dvbsky-firmware/defaults/main.yml" src yaml
*** tasks
#+INCLUDE: "roles/autoinstall-dvbsky-firmware/tasks/main.yml" src yaml
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
** TODO autoinstall-dvbhddevice
Problem: woher kommt der Treiber (AFAIK noch nicht im Kernel)? Die Firmware sollte in yavdr-firmware stecken
Add dependency to collect-facts
2018-01-16 12:06:02 +01:00
*** dependencies
#+BEGIN_SRC yaml :tangle roles/autoinstall-dvbhddevice/meta/main.yml :padline no
---
dependencies:
- { role: collect-facts }
#+END_SRC
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-dvbhddevice/tasks/main.yml :padline no
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
---
# file roles/autoinstall-dvbhddevice/tasks/main.yml
- name: apt | install vdr-plugin-dvbhddevice if connected
apt:
name: vdr-plugin-dvbhddevice
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: '"13c2:300a" in pci or "13c2:300b" in pci'
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
notify: [ 'Restart VDR' ]
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
#+END_SRC
** autoinstall-dvbsddevice
Add dependency to collect-facts
2018-01-16 12:06:02 +01:00
*** dependencies
#+BEGIN_SRC yaml :tangle roles/autoinstall-dvbsddevice/meta/main.yml :padline no
---
dependencies:
- { role: collect-facts }
#+END_SRC
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/autoinstall-dvbsddevice/tasks/main.yml :padline no
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
---
# file roles/autoinstall-dvbsddevice/tasks/main.yml
Add TODO for autoinstall-dvbsddevice
2017-11-18 09:06:20 +01:00
# TODO: install firmware
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
- name: apt | install vdr-plugin-dvbsddevice if module is loaded
apt:
name: vdr-plugin-dvbsddevice
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
when: '"dvb_ttpci" in modules'
add vdr restart handler to autoinstall roles, move satip detection
2017-03-13 19:34:54 +01:00
notify: [ 'Restart VDR' ]
Add some roles for autodetection of Hardware
2017-03-02 16:01:52 +01:00
#+END_SRC
Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino <luigidc@gmx.de> Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added
2017-11-13 09:46:51 +01:00
** autoinstall-hardware-irmp
Add dependency to collect-facts
2018-01-16 12:06:02 +01:00
*** dependencies
#+BEGIN_SRC yaml :tangle roles/autoinstall-hardware-irmp/meta/main.yml :padline no
---
dependencies:
- { role: collect-facts }
#+END_SRC
Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino <luigidc@gmx.de> Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added
2017-11-13 09:46:51 +01:00
*** tasks
#+BEGIN_SRC yaml :tangle roles/autoinstall-hardware-irmp/tasks/main.yml :padline no
---
# file roles/autoinstall-hardware-irmp/tasks/main.yml
- name: apt | install yavdr-hardware-irmp if connected
apt:
name: yavdr-hardware-irmp
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
state: present
Add USB ID for other irmp variant
2018-01-21 12:20:13 +01:00
when: '"1209:4444" in usb or "16c0:27d9" in usb'
Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino <luigidc@gmx.de> Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added
2017-11-13 09:46:51 +01:00
#+END_SRC
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
** kodi
*** tasks
**** Install KODI
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
***** main.yml
:PROPERTIES:
:UNNUMBERED: t
:END:
#+INCLUDE: "roles/kodi/tasks/main.yml" src yaml
***** install-kodi.yml
#+INCLUDE: "roles/kodi/tasks/install-kodi.yml" src yaml
***** configure-kodi.yml
#+INCLUDE: "roles/kodi/tasks/configure-kodi.yml" src yaml
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
*** templates
**** kodi.service
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
This systemd unit for the user session starts (and stops) kodi.
#+INCLUDE: "roles/kodi/templates/kodi.service.j2" src conf
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
*** files
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
Those configuration files provide a preconfiguration for kodi which overrides the system wide configuration
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
**** Lircmap.xml
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
This file allows to map keys sent by remotes via eventlircd (which uses the name ~devinput~) to kodi key names.
#+INCLUDE: "roles/kodi/files/userdata/Lircmap.xml" src nxml
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
**** keymaps
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
This file maps the keys defined in Lircmap.xml to actions within kodi.
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
***** remote.xml
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
#+INCLUDE: "roles/kodi/files/userdata/keymaps/remote.xml" src xml
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
** dvd
*** tasks
**** install libdvd-pkg, allow programs to eject optical media
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
:PROPERTIES:
:UNNUMBERED: t
:END:
#+INCLUDE: "roles/dvd/tasks/main.yml" src yaml
Remove unnecessary PassEnvironment= Option and add a Handler for sundtek.service
2018-03-25 13:09:54 +02:00
** install-sundtek
*** variables
*** tasks
#+BEGIN_SRC yaml :tangle roles/install-sundtek/tasks/main.yml :padline no
---
# file roles/install-sundtek/tasks/main.yml
- name: apt | install yavdr-hardware-sundtek
apt:
name: yavdr-hardware-sundtek
# TODO: include LD_PRELOAD in yavdr-hardware-sundtek!
#- name: set LD_PRELOAD for sundtek driver to VDR's environment
# file:
# src: files/sundtek_LD_PRELOAD.conf
# dest: /etc/systemd/system/vdr.service.d/sundtek_LD_PRELOAD.conf
- name: systemd | start sundtek.service
systemd:
name: sundtek.service
state: started
enabled: yes
masked: no
daemon-reload: yes
- name: detect local and remote sundtek devices
command: scansundtek
register: sundtek_scan
- name: set variable sundtek_scan
set_fact:
sundtek_devices: "{{ sundtek_scan.stdout | from_json }}"
- name: create /etc/sundtek.conf
template:
src: templates/sundtek.conf.j2
dest: /etc/sundtek.conf
notify: Restart sundtek.service
- name: systemd | start sundtek-avahi-mounter.service
systemd:
name: sundtek-avahi-mounter.service
state: started
masked: no
enabled: yes
daemon-reload: yes
#+END_SRC
*** templates
Add own section for sundtek template
2018-09-20 08:56:38 +02:00
**** /etc/sundtek.conf
Remove unnecessary PassEnvironment= Option and add a Handler for sundtek.service
2018-03-25 13:09:54 +02:00
#+BEGIN_SRC conf
# ----- GLOBAL SECTION -----
#Set loglevel for logging to /var/log/mediasrv.log
#autoupdate=[on|off] #enable automatic driver update, default off
autoupdate=off
#loglevel=[off|min|full] #default: off
#max .. little bit more
loglevel=off
#pluginpath=/path/to/drivers #set path to drivers
#dvb_api_version=x.y #default API version will be parsed from
#/usr/include/linux/dvb/version.h, if no such file is
Add section for sundtek.conf
2018-09-20 08:55:00 +02:00
#available the latest internally supported API ::version will be
Remove unnecessary PassEnvironment= Option and add a Handler for sundtek.service
2018-03-25 13:09:54 +02:00
#used (which will be quite new)
#audio_skip_bytes=N #when changing analogTV channels,
#skip N bytes to suppress audio noise
#bulk_notification[on|off] #default off, bulk_notification will only trigger device_attach once
#after the the first device scan when the driver is started up
#after this first scan, the notification will be triggered
#normally again for each device.
#
#for example when 2 devices are attached to the system only one
#notification will be triggered initially, any at a later time
#attached device will generate another device_attach notification
#by default each device will call the script which is set up with
#device_attach
#use_tvvideo=[on|off] #use /dev/tvvideoN instead of /dev/video
#this works around a new Adobe Flash bug in 2012, where flash crashes
#if files (/dev/videoN) other than /dev/video0 are available
#use_hwpidfilter=[on|off] #For DVB-C, DVB-T, DVB-S/S2
#enable PID filter, please be careful with that, there are only 15 HW Pid filters available
#when more than 15 pids are set up the pid filter will be disabled automatically
#dmhwpidfilter=[on|off] #default on, in some cases off might be useful to disable hw pid filter for settopboxes
#if you get a black image when capturing a TV channel and watching another channel on the
#same transponder - try this option and reboot
#usb_transaction_delay=[0-20] #throttle the USB setup transactions, this can solve problems with weak USB stacks for
#example for embedded boards, unit is milliseconds
#usb_timeout=[0 - N] #USB timeout for each transaction in milliseconds, 0 default infinite
#voltage_tone_off=[1 or 0] #0 .. default, normal behaviour
#1 .. force DVB-S/S2 to not use any Voltage or Tone (ignore any user parameters)
#ir_disabled=[1 or 0] #0 .. enable remote control polling, the driver will permanently check for remote control keys
#1 .. disable remote control polling, might fix bugs with weak USB stacks on embedded boards
#
#Enable listening on network
#enablenetwork=[on|off] #default: off
#Lowest adapter number to start with, e.g. /dev/dvb/adapter5/frontend0
#first_adapter=5
#Call attach script when new device appears
#device_attach=[PATH_TO_SCRIPT] [PARAMETER|DEVID] #"DEVID" will automatically be replaced with the device ID
device_attach=/usr/bin/sundtek_attach
#Call detach script when device disappears
#device_detach=[PATH_TO_SCRIPT] [PARAMETER|DEVID] #"DEVID" will automatically be replaced with the device ID
device_detach=/usr/bin/sundtek_detach
{% for device in sundtek_devices.local %}
{% if device.serial is defined %}
[{{ device.serial }}]
#Infrared protocol to use
#ir_protocol=[RC5|NEC|RC6] #default: NEC
{% if device.ir_protocol|default("") %}
ir_protocol={{ device.ir_protocol }}
{% endif %}
#Keymap to use, e.g. "/lib/udev/rc_keymaps/vp702x"
#rcmap=[PATH_TO_KEYMAP] #default: keymap which comes with the device
{% if device.rcmap|default("") %}
rcmap={{ device.rcmap }}
{% endif %}
#Choose initial DVB mode for hybrid DVB-T/DVB-C devices only
#initial_dvb_mode=[DVBC|DVBT]
{% if device.initial_dvb_mode|default("") %}
initial_dvb_mode={{ device.dvb_mode }}
{% endif %}
#Call attach script when new device appears
#device_attach=[PATH_TO_SCRIPT] [PARAMETER|DEVID] #"DEVID" will automatically be replaced with the device ID
device_attach=/usr/bin/sundtek_attach
#Call detach script when device disappears
#device_detach=[PATH_TO_SCRIPT] [PARAMETER|DEVID] #"DEVID" will automatically be replaced with the device ID
device_detach=/usr/bin/sundtek_detach
{% if device.capabilites.analog_tv %}
disable_analogtv=1 #disable initialization of analogTV Frontend
{% endif %}
{% endif %}
{% endfor %}
#+END_SRC
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
** template-test
Deduplicate kodi role code, use simple file instead of org-mode code block
2017-11-04 15:24:09 +01:00
:PROPERTIES:
:EXPORT: nil
:END:
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/template-test/tasks/main.yml :padline no
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
---
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
- name: show vars
debug:
var: '{{ system }}'
- name: test templates
template:
src: templates/test.j2
dest: /tmp/test.txt
#+END_SRC
Update TODO list
2017-05-18 16:06:31 +02:00
#+BEGIN_SRC shell :tangle roles/template-test/templates/xorg.conf_test.j2
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
Section "ServerLayout"
Identifier "Layout0"
Screen 0 "Screen0"
{% if system.x11.dualhead.enabled %}
Screen 1 "Screen1" RightOf "Screen0"
{% endif %}
InputDevice "Keyboard0" "CoreKeyboard"
InputDevice "Mouse0" "CorePointer"
EndSection
Section "InputDevice"
# generated from default
Identifier "Mouse0"
Driver "mouse"
Option "Protocol" "auto"
Option "Device" "/dev/psaux"
Option "Emulate3Buttons" "no"
Option "ZAxisMapping" "4 5"
EndSection
Update TODO list
2017-05-18 16:06:31 +02:00
# ignore devices with eventlircd tag
# ENV{ID_INPUT.tags}+="eventlircd"
# must be set by an udev rule
Section "InputClass"
Identifier "ignore eventlircd devices"
MatchTag "eventlircd"
Option "Ignore" "True"
EndSection
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
Section "InputDevice"
# generated from default
Identifier "Keyboard0"
Driver "kbd"
EndSection
Section "Monitor"
Identifier "Monitor0"
VendorName "Unknown"
ModelName "Unknown"
{% if system.x11.display.0.default == "VGA2Scart_4_3" or system.x11.display.0.default == "VGA2Scart_16_9" %}
HorizSync 14-17
VertRefresh 49-61
{% if system.x11.display.0.default == "VGA2Scart_4_3" %}
Modeline "VGA2Scart_4_3" 13.875 720 744 808 888 576 580 585 625 -HSync -Vsync interlace
{% elif system.x11.display.0.default == "VGA2Scart_16_9" %}
Modeline "VGA2Scart_16_9" 19 1024 1032 1120 1216 576 581 586 625 -Hsync -Vsync interlace
{% endif %}
{% endif %}
Option "DPMS"
Option "ExactModeTimingsDVI" "True"
EndSection
{% if system.x11.dualhead.enabled == "1" %}
Section "Monitor"
Identifier "Monitor1"
VendorName "Unknown"
ModelName "Unknown"
{% if system.x11.display.1.default in ("VGA2Scart_4_3", "VGA2Scart_16_9") %}
HorizSync 14-17
VertRefresh 49-61
{% if system.x11.display.1.default == "VGA2Scart_4_3" %}
Modeline "VGA2Scart_4_3" 13.875 720 744 808 888 576 580 585 625 -HSync -Vsync interlace
{% elif system.x11.display.1.default == "VGA2Scart_16_9" %}
Modeline "VGA2Scart_16_9" 19 1024 1032 1120 1216 576 581 586 625 -Hsync -Vsync interlace
{% endif %}
Option "DPMS"
Option "ExactModeTimingsDVI" "True"
{% endif %}
EndSection
{% endif %}
Section "Device"
Identifier "Device0"
{% if system.hardware.nvidia.detected %}
Driver "nvidia"
VendorName "NVIDIA Corporation"
{% endif %}
Screen 0
Option "DPI" "100x100"
{% if system.hardware.nvidia.busid %}
BusID "PCI: {{ system.hardware.nvidia.busid }}"
{% endif %}
Option "NoLogo" "True"
Option "UseEvents" "True"
Option "TripleBuffer" "False"
Option "AddARGBGLXVisuals" "True"
Option "TwinView" "0"
Option "DynamicTwinView" "0"
Option "OnDemandVBlankinterrupts" "on"
Option "FlatPanelProperties" "Scaling = Native"
EndSection
{% if system.x11.dualhead.enabled == "1" %}
Section "Device"
Identifier "Device1"
{% if system.hardware.nvidia.detected %}
Driver "nvidia"
VendorName "NVIDIA Corporation"
{% endif %}
Screen 1
{% if system.hardware.nvidia.busid %}
BusID "PCI: {{ system.hardware.nvidia.busid }}"
{% endif %}
Option "NoLogo" "True"
Option "UseEvents" "True"
Option "TripleBuffer" "False"
Option "AddARGBGLXVisuals" "True"
Option "TwinView" "0"
Option "DynamicTwinView" "0"
EndSection
{% endif %}
Section "Screen"
Identifier "Screen0"
Device "Device0"
Monitor "Monitor0"
DefaultDepth 24
SubSection "Display"
Depth 24
{% if system.x11.display.0.default is defined and system.x11.display.0.default %}
Modes "{{ system.x11.display.0.default }}"{% for mode in system.x11.display.0.mode %}{% if mode != system.x11.display.0.default %} "{{ mode }}"{% endif %}{% endfor %}
{% elif system.hardware.nvidia.detected == 1 %}
Modes "nvidia-auto-select"
{% endif %}
EndSubSection
{% if system.x11.display.0.default or system.x11.default %}
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
{% if system.x11.display.0.device is definded and system.x11.display.0.device %}
Option "ConnectedMonitor" {{ system.x11.display.0.device }}
{% else %}
Option "ConnectedMonitor" {{ system.x11.default }}
{% endif %}
# Option "ConnectedMonitor" "<?cs if:(?system.x11.display.0.device) ?><?cs call:fix_display_name(system.x11.display.0.device) ?><?cs else ?><?cs var:system.x11.default ?><?cs /if ?><?cs if:(?system.x11.dualhead.enabled && system.x11.dualhead.enabled == 1) ?>, <?cs call:fix_display_name(system.x11.display.1.device) ?><?cs /if ?>"
#Option "ConnectedMonitor"
"<?cs if:(?system.x11.display.0.device) ?>
<?cs call:fix_display_name(system.x11.display.0.device) ?>
<?cs else ?>
<?cs var:system.x11.default ?>
<?cs /if ?>
<?cs if:(?system.x11.dualhead.enabled && system.x11.dualhead.enabled == 1) ?>, <?cs call:fix_display_name(system.x11.display.1.device) ?><?cs /if ?>"
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
# Option "UseDisplayDevice" "<?cs if:(?system.x11.display.0.device) ?><?cs call:fix_display_name(system.x11.display.0.device) ?><?cs else ?><?cs var:system.x11.default ?><?cs /if ?>"
# <?cs /if ?>
# <?cs if:(?system.hardware.nvidia.0.edid && system.hardware.nvidia.0.edid == "1") ?>
# Option "CustomEDID" "<?cs call:fix_display_name(system.x11.display.0.device) ?>:/etc/X11/edid.0.yavdr"
# <?cs /if ?>
# <?cs if:(system.hardware.nvidia.detected == 1 && ?system.x11.display.0.device) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.0.device) ?>: <?cs var:system.x11.display.0.default ?> { ViewPortIn=<?cs var:system.x11.display.0.viewport.in.x ?>x<?cs var:system.x11.display.0.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.0.viewport.out.x ?>x<?cs var:system.x11.display.0.viewport.out.y ?>+<?cs var:system.x11.display.0.viewport.out.plusx ?>+<?cs var:system.x11.display.0.viewport.out.plusy ?> }"
# <?cs each:mode = system.x11.display.0.mode ?><?cs if:(mode != system.x11.display.0.default) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.0.device) ?>: <?cs var:mode ?> { ViewPortIn=<?cs var:system.x11.display.0.viewport.in.x ?>x<?cs var:system.x11.display.0.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.0.viewport.out.x ?>x<?cs var:system.x11.display.0.viewport.out.y ?>+<?cs var:system.x11.display.0.viewport.out.plusx ?>+<?cs var:system.x11.display.0.viewport.out.plusy ?> }"<?cs /if ?><?cs /each ?>
{% endif %}
EndSection
{% if system.x11.dualhead.enabled == "1" %}
Section "Screen"
Identifier "Screen1"
Device "Device1"
Monitor "Monitor1"
DefaultDepth 24
SubSection "Display"
Depth 24
{% if system.x11.display.0.default is defined and system.x11.display.0.default %}
Modes "{{ system.x11.display.1.default }}"{% for mode in system.x11.display.1.mode %}{% if mode != system.x11.display.1.default %} "{{ mode }}"{% endif %}{% endfor %}
{% elif system.hardware.nvidia.detected == "1" %}
Modes "nvidia-auto-select"
{% endif %}
EndSubSection
# <?cs if:(?system.x11.display.1.default && system.x11.display.1.default != "" && system.x11.display.1.default != "disabled") ?>
# Option "UseDisplayDevice" "<?cs call:fix_display_name(system.x11.display.1.device) ?>"
# <?cs /if ?>
# <?cs if:(?system.hardware.nvidia.1.edid && system.hardware.nvidia.1.edid == "1") ?>
# Option "CustomEDID" "<?cs call:fix_display_name(system.x11.display.1.device) ?>:/etc/X11/edid.1.yavdr"
# <?cs /if ?>
# <?cs if:(system.hardware.nvidia.detected == 1 && ?system.x11.display.1.device) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.1.device) ?>: <?cs var:system.x11.display.1.default ?> { ViewPortIn=<?cs var:system.x11.display.1.viewport.in.x ?>x<?cs var:system.x11.display.1.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.1.viewport.out.x ?>x<?cs var:system.x11.display.1.viewport.out.y ?>+<?cs var:system.x11.display.1.viewport.out.plusx ?>+<?cs var:system.x11.display.1.viewport.out.plusy ?> }"
# <?cs each:mode = system.x11.display.1.mode ?><?cs if:(mode != system.x11.display.1.default) ?>
# Option "MetaModes" "<?cs call:fix_display_name(system.x11.display.1.device) ?>: <?cs var:mode ?> { ViewPortIn=<?cs var:system.x11.display.1.viewport.in.x ?>x<?cs var:system.x11.display.1.viewport.in.y ?>, ViewPortOut=<?cs var:system.x11.display.1.viewport.out.x ?>x<?cs var:system.x11.display.1.viewport.out.y ?>+<?cs var:system.x11.display.1.viewport.out.plusx ?>+<?cs var:system.x11.display.1.viewport.out.plusy ?> }"<?cs /if ?><?cs /each ?>
# <?cs /if ?>
EndSection
{% endif %}
Update TODO list
2017-05-18 16:06:31 +02:00
{% if not system.x11.use_compositing %}
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
Section "Extensions"
Update TODO list
2017-05-18 16:06:31 +02:00
# if not open-gl OSD is needed (e.g. for vdr-sxfe):
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
Option "Composite" "Disable"
EndSection
Update TODO list
2017-05-18 16:06:31 +02:00
{% endif %}
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
#+END_SRC
#+BEGIN_SRC yaml :tangle roles/template-test/defaults/main.yml
foo:
- bar
- baz
- spam
system:
hardware:
nvidia:
detected: "1"
busid: "000:2304:234"
x11:
dualhead:
enabled: "0"
display:
0:
mode:
- "1920x1080_50"
default: "nvidia-auto"
1:
mode:
- "1280x720_60"
#+END_SRC
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
** 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
Add template for vdr-addon-acpiwakeup.conf
2017-11-20 11:54:11 +01:00
apt:
name: vdr-addon-acpiwakeup
state: present
when: wakeup_method == "acpiwakeup"
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
Add template for vdr-addon-acpiwakeup.conf
2017-11-20 11:54:11 +01:00
- name: expand template for /etc/vdr/vdr-addon-acpiwakeup.conf
template:
fix template path
2017-11-20 12:01:02 +01:00
src: templates/vdr-addon-acpiwakeup.conf.j2
Add template for vdr-addon-acpiwakeup.conf
2017-11-20 11:54:11 +01:00
dest: /etc/vdr/vdr-addon-acpiwakeup.conf
create extra role for wakeup configuration
2017-11-20 09:45:15 +01:00
#+END_SRC
Add template for vdr-addon-acpiwakeup.conf
2017-11-20 11:54:11 +01:00
*** templates
#+BEGIN_SRC jinja2 :tangle roles/wakeup/templates/vdr-addon-acpiwakeup.conf.j2 :padline no
use ansible_managed instead of own variable ansible_managed_file
2018-01-16 13:07:01 +01:00
{{ ansible_managed | comment }}
Add template for vdr-addon-acpiwakeup.conf
2017-11-20 11:54:11 +01:00
# Activate/deactivate ACPIWakeup with yes/no:
ACPI_ENABLED="{% if wakeup_method == 'acpiwakeup' %}yes{% else %}no{% endif %}"
# How many minutes should the machine wake up before the timer starts:
ACPI_START_AHEAD=5
# If you want your VDR machine to wakeup in regular intervals (i.e. for
# updating EPG data), specify the days of the week and the wakeup time.
#
# Days of the week for regular wakeup (not set=Disabled, 1=Monday...7=Sunday)
# ACPI_REGULAR_DAYS="1 2 3 4 5 6 7"
# Wakeup time
#ACPI_REGULAR_TIME=01:00 # HH:MM
#+END_SRC
fix some roles, change order of role execution in playbook
2017-03-13 22:25:32 +01:00
** grub-config
*** default variables
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/grub-config/defaults/main.yml :mkdirp yes :padline no
fix some roles, change order of role execution in playbook
2017-03-13 22:25:32 +01:00
system:
shutdown: poweroff
grub:
timeout: 0
boot_options: quiet nosplash
#+END_SRC
*** tasks
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/grub-config/tasks/main.yml :mkdirp yes :padline no
---
fix some roles, change order of role execution in playbook
2017-03-13 22:25:32 +01:00
- name: custom grub configuration for timeout and reboot halt
template:
src: templates/50_custom.j2
dest: /etc/grub.d/50_custom
mode: '0775'
notify: [ 'Update GRUB' ]
# TODO: add special case if plymouth is used
- name: let the system boot quietly
lineinfile:
dest: /etc/default/grub
state: present
regexp: '^(GRUB_CMDLINE_LINUX_DEFAULT=")'
line: '\1{{ grub.boot_options}}"'
backrefs: yes
notify: [ 'Update GRUB' ]
#+END_SRC
*** templates
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC shell :tangle roles/grub-config/templates/50_custom.j2 :mkdirp yes :padline no
fix some roles, change order of role execution in playbook
2017-03-13 22:25:32 +01:00
#!/bin/sh
exec tail -n +3 $0
# This file is configured by the ansible configuration for yaVDR
{% if system.shutdown is defined and system.shutdown == 'reboot' %}
menuentry "PowerOff" {
halt
}
{% endif %}
if [ "${recordfail}" = 1 ]; then
set timeout={{ 3 if grub.timeout < 3 else grub.timeout }}
else
set timeout={{ grub.timeout if grub.timeout is defined else 0 }}
fi
#+END_SRC
*** handlers
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC yaml :tangle roles/grub-config/handlers/main.yml :mkdirp yes :padline no
---
Initial changes to support intel gpu autoconfiguration still a lot to do...
2018-06-06 07:51:07 +02:00
- name: Update Initramfs
command: "update-initramfs -u"
failed_when: ('error' in initramfs_register_update.stderr)
register: initramfs_register_update
fix some roles, change order of role execution in playbook
2017-03-13 22:25:32 +01:00
- name: Update GRUB
command: update-grub
failed_when: ('error' in grub_register_update.stderr)
register: grub_register_update
# TODO: Do we need to use grub-set-default?
# https://github.com/yavdr/yavdr-utils/blob/master/events/actions/update-grub
#+END_SRC
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
* Modules
This section contains custom modules for the yaVDR Playbooks. They are used to collect facts about the system and configure applications and daemons.
** hardware_facts.py
Fix shebang
2018-08-10 08:59:46 +02:00
#+BEGIN_SRC python :tangle library/hardware_facts.py :shebang "#!/usr/bin/env python"
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
# This Module collects the vendor- and device ids for USB- and PCI(e)-devices and currently loaded kernel modules.
DOCUMENTATION = '''
add xorg configuration and driver autodetection
2017-06-20 15:09:15 +02:00
---
module: hardware_facts
short_description: collects facts for kernel modules, usb and pci devices
description:
- This Module collects the vendor- and device ids for USB- and PCI(e)-devices and
currently loaded kernel modules.
options:
usb:
required: False
default: True
description:
- return a list of vendor- and device ids for usb devices in '04x:04x' notation
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
pci:
required: False
default: True
description:
- return a list of vendor- and device ids for pci devices in '04x:04x' notation
modules:
required: False
default: True
description:
- return a list of currently loaded kernel modules
gpus:
required: False
default: True
description:
- return a list of devices of the pci gpu class (0x030000)
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
acpi_power_modes:
required: False
default: True
description:
- return a list of supported acpi power saving modes
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
notes:
- requres python-pyusb and python-kmodpy
requirements: [ ]
author: "Alexander Grothe <seahawk1986@gmx.de>"
'''
EXAMPLES = '''
- name: get information about usb and pci hardware and loaded kernel modules
hardware_facts:
usb: True
pci: True
modules: True
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
acpi_power_modes: True
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
- debug:
var: usb
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- debug:
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
var: pci
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- debug:
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
var: modules
improve syntax, add new variables for detected gpus
2017-11-21 11:30:03 +01:00
- debug:
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
var: gpus
'''
import glob
import json
import os
import sys
import usb.core
from collections import namedtuple
Make hardware_facts.py work with different levels of PCI device trees
2018-04-20 11:47:18 +02:00
from itertools import chain
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
import kmodpy
from ansible.module_utils.basic import *
fix indentation errors
2017-06-20 16:38:38 +02:00
PCIDevice = namedtuple("PCIDevice", 'idVendor idProduct idClass pciPath')
Fix listing of pci cards and gpu filtering
2017-07-16 08:03:50 +02:00
vendor_dict = {
0x10de: 'nvidia',
0x8086: 'intel',
0x1002: 'amd',
0x80ee: 'virtualbox',
}
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
def get_pci_devices():
Make hardware_facts.py work with different levels of PCI device trees
2018-04-20 11:47:18 +02:00
for device in chain(glob.glob('/sys/devices/pci*/*:*:*/'), glob.glob('/sys/devices/pci*/*:*:*/*:*:*/')):
Fix listing of pci cards and gpu filtering
2017-07-16 08:03:50 +02:00
try:
with open(os.path.join(device, 'device')) as d:
product_id = int(d.read().strip(), 16)
with open(os.path.join(device, 'vendor')) as d:
vendor_id = int(d.read().strip(), 16)
with open(os.path.join(device, 'class')) as d:
class_id = int(d.read().strip(), 16)
yield PCIDevice(idVendor=vendor_id, idProduct=product_id, idClass=class_id, pciPath=device)
except IOError:
pass
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
def format_device_list(iterator):
return ["{:04x}:{:04x}".format(d.idVendor, d.idProduct) for d in iterator]
def format_gpu_device_list(iterator):
def get_entries(iterator):
for d in iterator:
if d.idClass == 0x030000:
Return a list of dicts with GPU properties instead of a list of lists
2017-07-16 08:16:55 +02:00
yield {"VendorName": vendor_dict.get(d.idVendor, "unknown"),
"VendorID": d.idVendor, "ProductID": d.idProduct}
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
return [entry for entry in get_entries(iterator)]
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
def list_acpi_power_modes():
acpi_power_modes = []
try:
with open('/sys/power/state') as f:
acpi_power_modes = [l for l in f.readline().split()]
except IOError:
pass
return acpi_power_modes
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
arg_specs = {
'usb': dict(default=True, type='bool', required=False),
'pci': dict(default=True, type='bool', required=False),
'modules': dict(default=True, type='bool', required=False),
'gpus': dict(default=True, type='bool', required=False),
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
'acpi_power_modes': dict(default=True, type='bool', required=False),
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
}
def main():
module = AnsibleModule(argument_spec=arg_specs, supports_check_mode=True,)
collect_usb = module.params['usb']
collect_pci = module.params['pci']
collect_modules = module.params['modules']
collect_gpus = module.params['gpus']
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
collect_acpi_power_modes = module.params['acpi_power_modes']
usb_devices = []
pci_devices = []
modules = []
gpus = []
extend hardware_facts.py with bool variables for detected graphic card manufacturers
2017-11-22 09:24:33 +01:00
nvidia_detected = False
intel_detected = False
amd_detected = False
virtualbox_detected = False
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
acpi_power_modes = []
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
if collect_usb:
usb_devices = format_device_list(usb.core.find(find_all=True))
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
if collect_pci:
pci_devices = format_device_list(get_pci_devices())
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
if collect_modules:
k = kmodpy.Kmod()
modules = [m[0] for m in k.loaded()]
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
if collect_gpus:
gpus = format_gpu_device_list(get_pci_devices())
Fix iteration over list
2017-11-22 09:26:32 +01:00
nvidia_detected = any((True for gpu in gpus if gpu['VendorName'] == 'nvidia'))
intel_detected = any((True for gpu in gpus if gpu['VendorName'] == 'intel'))
amd_detected = any((True for gpu in gpus if gpu['VendorName'] == 'amd'))
virtualbox_detected = any((True for gpu in gpus if gpu['VendorName'] == 'virtualbox'))
put custom fact collection in own role "collect-facts" so it is not necessary to run yavdr-common every time we use an autoinstall-* role
2017-11-20 09:21:22 +01:00
if collect_acpi_power_modes:
acpi_power_modes = list_acpi_power_modes()
data = {'usb': usb_devices, 'pci': pci_devices, 'modules': modules, 'gpus': gpus,
extend hardware_facts.py with bool variables for detected graphic card manufacturers
2017-11-22 09:24:33 +01:00
'acpi_power_modes': acpi_power_modes, 'nvidia_detected': nvidia_detected,
'intel_detected': intel_detected, 'amd_detected': amd_detected,
'virtualbox_detected': virtualbox_detected}
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
module.exit_json(changed=False, ansible_facts=data, msg=data)
if __name__ == '__main__':
main()
#+END_SRC
Add pci_facts.py module for detailed PCI device descriptions
2018-08-10 09:01:53 +02:00
** pci_facts.py
#+BEGIN_SRC python :tangle library/pci_facts.py :shebang "#!/usr/bin/env python"
# This module parses the output of lspci for detailed information about available (sub) devices.
DOCUMENTATION = '''
---
module: pci_facts
short_description: parses lspci output for detailed (sub) devices data
description:
- This module parses the output of lspci for detailed information about available (sub) devices.
- returns a list with a dict for each device
notes:
- requires lspci (package pciutils)
'''
EXAMPLES = '''
- name: get detailled pci device infos
pci_facts:
- debug:
var: pci_devices
'''
import argparse
import shlex
import subprocess
from collections import namedtuple
from ansible.module_utils.basic import *
def convert2hex(arg):
arg = arg.strip('"')
if arg:
return int(arg, 16)
else:
return None
def parse_lspci_data():
parser = argparse.ArgumentParser()
parser.add_argument('-r', '--revision', help='revision', type=convert2hex)
parser.add_argument('-p', '--progif', help='proginf', type=convert2hex)
parser.add_argument('slot')
parser.add_argument('device_class', type=convert2hex)
parser.add_argument('vendor_id', type=convert2hex)
parser.add_argument('device_id', type=convert2hex)
parser.add_argument('sub_vendor_id', type=convert2hex)
parser.add_argument('sub_device_id', type=convert2hex)
parser.add_argument('other', nargs='*', default=[])
devices = []
for line in subprocess.check_output(['lspci', '-nm'], universal_newlines=True).splitlines():
args = parser.parse_args(args=shlex.split(line))
devices.append(vars(args))
return devices
def main():
arg_specs = {}
module = AnsibleModule(argument_spec=arg_specs, supports_check_mode=True,)
try:
pci_devices = parse_lspci_data()
except:
module.fail_json(msg="Something fatal happened")
data = {'pci_devices': pci_devices}
module.exit_json(changed=False, ansible_facts=data, msg=data)
if __name__ == '__main__':
main()
#+END_SRC
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
** satip_facts.py
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC python :tangle library/satip_facts.py :shebang #!/usr/bin/env python2
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
DOCUMENTATION = '''
---
module: hardware_facts
short_description: "check if at least one SAT>IP server responds on the network"
description:
- This script sends a multicast message and awaits responses by Sat>IP servers.
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
Returns a list of detected SAT>IP servers with their name and capabilites.
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
'''
EXAMPLES = '''
- name: "detect SAT>IP Server on the network"
action: satip_facts
- debug:
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
var: satip_devices
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
'''
import json
import socket
import sys
import time
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
import xml.etree.ElementTree as ET
import requests
from contextlib import contextmanager
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
from ansible.module_utils.basic import *
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
SSDP_BIND = "0.0.0.0"
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
SSDP_ADDR = "239.255.255.250"
SSDP_PORT = 1900
# SSDP_MX = max delay for server response
# a value of 2s is recommended by the SAT>IP specification 1.2.2
SSDP_MX = 2
SSDP_ST = "urn:ses-com:device:SatIPServer:1"
ssdpRequest = "\r\n".join((
"M-SEARCH * HTTP/1.1",
"HOST: %s:%d" % (SSDP_ADDR, SSDP_PORT),
"MAN: \"ssdp:discover\"",
"MX: %d" % (SSDP_MX),
"ST: %s" % (SSDP_ST),
"\r\n"))
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
@contextmanager
def socket_manager(*args, **kwargs):
"""provide a context manager for socket"""
sock = socket.socket(*args, **kwargs)
sock.setblocking(False)
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
except socket.error:
pass
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
sock.settimeout(SSDP_MX + 0.5)
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
sock.bind((SSDP_BIND, SSDP_PORT))
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
try:
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
yield sock
finally:
sock.close()
def parse_satip_xml(data):
""" Parse SAT>IP XML data.
Args:
data (str): XML input data..
Returns:
dict: Parsed SAT>IP device name and frontend information.
"""
result = {'name': '', 'frontends': {}}
if data:
root = ET.fromstring(data)
name = root.find('.//*/{urn:schemas-upnp-org:device-1-0}friendlyName')
result['name'] = name.text
satipcap = root.find('.//*/{urn:ses-com:satip}X_SATIPCAP')
if satipcap is None:
raise ValueError("Invalid SAT>IP device description")
caps = {}
for system in satipcap.text.split(","):
cap = system.split("-")
if cap:
count = int(cap[1])
if cap[0] in caps:
count = count + caps[cap[0]]
caps[cap[0]] = count
result['frontends'] = caps
return result
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
Update satip_facts.py, fix syntax for hardware autoinstall checks
2017-09-04 12:29:53 +02:00
def main():
description_urls = []
device_list = []
module = AnsibleModule(argument_spec={}, supports_check_mode=True,)
with socket_manager(socket.AF_INET, socket.SOCK_DGRAM) as sock:
# according to Sat>IP Specification 1.2.2, p. 20
# a client should send three requests within 100 ms with a ttl of 2
for _ in range(3):
sock.sendto(ssdpRequest, (SSDP_ADDR, SSDP_PORT))
time.sleep(0.03)
try:
response = sock.recv(1024)
if response and "SERVER:" in response:
for line in response.splitlines():
if "LOCATION" in line:
url = line.split()[-1].strip()
if url not in description_urls:
description_urls.append(url)
info = requests.get(url, timeout=2)
device_list.append(parse_satip_xml(info.text))
else:
raise ValueError('No satip server detected')
except (socket.timeout, ValueError, ET.ParseError):
pass
module.exit_json(changed=False, ansible_facts={'satip_devices': device_list})
if __name__ == '__main__':
Move local fact scripts to modules
2017-03-03 10:39:59 +01:00
main()
#+END_SRC
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
** xrandr_facts.py
- [ ] support multiple screens (-d :0.0 .. :0.n)
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
fix padline option for source blocks
2017-06-21 12:46:51 +02:00
#+BEGIN_SRC python :tangle library/xrandr_facts.py :shebang #!/usr/bin/env python2
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
from __future__ import print_function
import ast
import binascii
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
import csv
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
import re
import subprocess
from collections import namedtuple
from ansible.module_utils.basic import *
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
DOCUMENTATION = '''
---
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
module: xrandr_facts
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
short_description: "gather facts about connected monitors and available modelines"
description:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- 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.
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
options:
display:
required: False
default: ":0"
description:
- the DISPLAY variable to use when calling xrandr
Fix condition
2017-12-19 20:10:39 +01:00
preferred_outputs:
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
required: False
Fix example list in module documentation
2017-12-20 10:44:05 +01:00
default: ["HDMI", "DP", "DVI", "VGA", "TV"]
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
description:
- ranking of the preferred display connectors
preferred_refreshrates:
required: False
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
default: ["50", "60", "75", "30", "25"]
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
description:
- ranking of the preferred display refreshrate
preferred_resolutions:
required: False
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
default: ["7680x4320", "3840x2160", "1920x1080", "1280x720", "720x576"]
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
description:
- ranking of the preferred display resolutions
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
write_edids:
required: False
default: True
description:
- write edid data to /etc/X11/edid.{connector}.bin
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
'''
EXAMPLES = '''
- name: "collect facts for connected displays"
action: xserver_facts
display: ":0"
- debug:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
var: xrandr
Update some descriptions, rearrange order of tasks
2017-07-15 14:28:23 +02:00
- debug:
var: xorg
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
'''
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
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),
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
'write_edids': dict(default=True, type='bool', required=False),
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
}
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
SCREEN_REGEX = re.compile("^(?P<screen>Screen\s\d+:)(?:.*)")
CONNECTOR_REGEX = re.compile(
"^(?P<connector>.*-\d+)\s(?P<connection_state>connected|disconnected)\s(?P<primary>primary)?")
MODE_REGEX = re.compile("^\s+(?P<resolution>\d{3,}x\d{3,}).*")
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
Mode = namedtuple('Mode', ['connection', 'resolution', 'refreshrate'])
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
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]
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
preferred_resolutions = module.params['preferred_resolutions']
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
# ["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()
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
else:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
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
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
def parse_edid_data(edid):
vendor = "Unknown"
model = "Unknown"
Add error handling for parse-edid call. If parse-edid can not parse the given edid, use "Unknown" for vendor and model name.
2018-05-08 10:28:25 +02:00
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]
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
return vendor, model
def collect_nvidia_data():
BusID_RE = re.compile((
'(?P<domain>[0-9a-fA-F]+)'
':'
'(?P<bus>[0-9a-fA-F]+)'
':'
'(?P<device>[0-9a-fA-F]+)'
'\.'
'(?P<function>[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
don't fail in xrandr_facts.py if nvidia-smi is not available
2017-11-22 11:47:44 +01:00
except OSError:
# nvidia-smi is not installed
pass
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
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
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
def output_data(data, write_edids=True):
Add PPA for Ansible 2.6 so ansible_virtualization_type and ansible_virtualization_role are always defined. This ist important on older Hardware (e.g. AMD64 3000+).
2018-09-05 12:23:30 +02:00
result = {}
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
if data:
modes = []
for _, screen_data in data.items():
for connector, connection_data in screen_data.items():
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
if connection_data.get('EDID') and write_edids:
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
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:
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
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)
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
#print(json.dumps(data, sort_keys=True, indent=4))
add xorg autoconfiguration, install some config files for vdr, update nfs- and avahi configuration
2017-07-08 13:37:35 +02:00
module.exit_json(changed=True if write_edids else False, ansible_facts={'xrandr': data, 'xorg': result})
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
if __name__ == '__main__':
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
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))
Update Manual.org, make writing edid data optional in xrandr_facts.py
2017-04-12 10:35:12 +02:00
output_data(xorg_data, module.params['write_edids'])
Add module for display resolution detection. xorg_facts sets the variable xorg with display information parsed from xrandr's output
2017-03-26 13:57:31 +02:00
#+END_SRC
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
* Handlers
#+BEGIN_SRC yaml :tangle handlers/main.yml :mkdirp yes
Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino <luigidc@gmx.de> Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added
2017-11-13 09:46:51 +01:00
- name: Reconfigure unattended upgrades with dpkg
command: '/usr/sbin/dpkg-reconfigure --frontend noninteractive unattended-upgrades'
add handler to trigger udev rule reloading
2017-11-18 10:15:54 +01:00
- name: Trigger Udev
command: 'udevadm trigger '
Squashed commit of the following: commit fbad7b65aa70cc8132dada7494c8f31df9fd31bb Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:44:42 2017 +0100 remove whitespace commit 7c2b1ce55d86d733dda7ef7551453ec0c15aa748 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:30:42 2017 +0100 update handlers commit c985a332291fadd6077e876965de13df4d3c426d Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:27:02 2017 +0100 run dpkg-reconfigure if necessary commit 03584030735c54b9ff6eb55e6a108b3e08828be6 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:24:13 2017 +0100 fix indentation and quoting commit 11a7f5478c3cb401075e34b4dca443ec15b1a19e Merge: 9d1eb3a ca0bc80 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:21:59 2017 +0100 Merge branch 'irmp' of https://github.com/yavdr/yavdr-ansible into irmp commit 9d1eb3a6e35a229bd5bde21df11aee93d52ff104 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit ca0bc806ca2da76d7ef96cb56afe4afe2265d820 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:14:11 2017 +0100 use debconf module instead of shell command commit 9794d7b9efc16884a17d1f7312b9aeaa536829cf Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:03:02 2017 +0100 Update Manual.conf commit 36d189e31cb716bf51c3094bdcbab4c6c808bb92 Author: Alexander Grothe <seahawk1986@gmx.de> Date: Mon Nov 13 09:00:53 2017 +0100 Update Manual.org, fix file permissions for role commit 896516242be65023732ee0727d81247c8f77487e Author: Luigi Di Carmino <luigidc@gmx.de> Date: Sun Nov 12 21:31:18 2017 +0100 yavdr-hardware-irmp added
2017-11-13 09:46:51 +01:00
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
- name: Restart Samba
systemd:
name: smbd.service
state: restarted
enabled: yes
#masked: no
register: samba_reload
Add role to install nfs-server, cleanup roles and configuration - use generic media_dirs including vdr recdir, loop over them to create directories, configure samba, nfs, etc. - add role to install an configure nfs-kernel-server - cleanup roles - add custom fact modules
2017-03-13 10:40:35 +01:00
- name: Restart NFS Kernel Server
systemd:
name: nfs-server.service
state: restarted
enabled: yes
#masked: no
register: nfs_reload
cleanup
2017-03-13 15:27:21 +01:00
Remove unnecessary PassEnvironment= Option and add a Handler for sundtek.service
2018-03-25 13:09:54 +02:00
- name: Restart sundtek.service
systemd:
name: sundtek.service
state: restarted
enabled: yes
masked: no
cleanup
2017-03-13 15:27:21 +01:00
- name: Restart VDR
systemd:
name: vdr.service
state: restarted
enabled: yes
register: vdr_restart
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- name: Stop VDR
systemd:
name: vdr.service
state: stopped
enabled: yes
register: vdr_stop
- name: Start VDR
systemd:
name: vdr.service
state: started
enabled: yes
register: vdr_start
Use yavdr-xorg to control xlogin@vdr.service and x@vt7.service
2018-04-24 09:56:29 +02:00
- name: Start yavdr-xorg
systemd:
daemon_reload: yes
name: 'yavdr-xorg'
enabled: yes
state: started
register: yavdr_xorg_start
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- name: Stop xlogin
systemd:
name: xlogin@vdr.service
state: stopped
enabled: yes
register: xlogin_stop
Fix handler name
2018-01-07 17:58:33 +01:00
- name: Start xlogin
Start xlogin@vdr after xorg.detect using a handler
2018-01-07 17:55:18 +01:00
systemd:
daemon_reload: yes
name: 'xlogin@{{ vdr.user }}'
enabled: yes
state: started
register: xlogin_start
Add fact collection with xrandr
2017-04-10 13:24:40 +02:00
- name: Stop x
systemd:
name: x@vt7.service
state: stopped
register: x_stop
Update Manual.org and Manual.html
2018-08-10 08:13:55 +02:00
- name: reboot required
debug:
msg: PLEASE REBOOT YOUR SYSTEM.
add role for samba-install, grub-config, update network and handlers
2017-02-23 13:15:04 +01:00
#+END_SRC
Reference in New Issue Copy Permalink