diff --git a/group_vars/all b/group_vars/all index d6db646..dd92388 100644 --- a/group_vars/all +++ b/group_vars/all @@ -1,4 +1,3 @@ - # file: group_vars/all # this is the standard text to put in templates diff --git a/handlers/main.yml b/handlers/main.yml index d7fd733..840b674 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,4 +1,3 @@ - - name: Restart Samba systemd: name: smbd.service diff --git a/install-yavdr.sh b/install-yavdr.sh index d8aa931..d3bd2d8 100755 --- a/install-yavdr.sh +++ b/install-yavdr.sh @@ -1,5 +1,4 @@ #!/bin/bash - if (( $EUID != 0 )); then echo "This script must be run using sudo or as root" exit diff --git a/library/hardware_facts.py b/library/hardware_facts.py index 4eb11f0..ef58f76 100644 --- a/library/hardware_facts.py +++ b/library/hardware_facts.py @@ -1,127 +1,126 @@ + #!/usr/bin/env python -#!/usr/bin/env python + # This Module collects the vendor- and device ids for USB- and PCI(e)-devices and currently loaded kernel modules. + DOCUMENTATION = ''' + --- + 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 -# This Module collects the vendor- and device ids for USB- and PCI(e)-devices and currently loaded kernel modules. -DOCUMENTATION = ''' ---- -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 + pci: + required: False + default: True + description: + - return a list of vendor- and device ids for pci devices in '04x:04x' notation - 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 - 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) + notes: + - requres python-pyusb and python-kmodpy + requirements: [ ] + author: "Alexander Grothe " + ''' - gpus: - required: False - default: True - description: - - return a list of devices of the pci gpu class (0x030000) -notes: - - requres python-pyusb and python-kmodpy -requirements: [ ] -author: "Alexander Grothe " -''' + EXAMPLES = ''' + - name: get information about usb and pci hardware and loaded kernel modules + hardware_facts: + usb: True + pci: True + modules: True + - debug: + var: usb + - debug + var: pci + - debug + var: modules + - debug + var: gpus + ''' -EXAMPLES = ''' -- name: get information about usb and pci hardware and loaded kernel modules - hardware_facts: - usb: True - pci: True - modules: True -- debug: - var: usb -- debug - var: pci -- debug - var: modules -- debug - var: gpus -''' + import glob + import json + import os + import sys + import usb.core + from collections import namedtuple -import glob -import json -import os -import sys -import usb.core -from collections import namedtuple - -import kmodpy -from ansible.module_utils.basic import * + import kmodpy + from ansible.module_utils.basic import * -PCIDevice = namedtuple("PCIDevice", 'idVendor idProduct idClass pciPath') + PCIDevice = namedtuple("PCIDevice", 'idVendor idProduct idClass pciPath') -def get_pci_devices(): - for device in glob.glob('/sys/devices/pci*/*:*:*/'): - 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) + def get_pci_devices(): + for device in glob.glob('/sys/devices/pci*/*:*:*/'): + 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) -def format_device_list(iterator): - return ["{:04x}:{:04x}".format(d.idVendor, d.idProduct) for d in iterator] + 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: - yield ("{:04x}:{:04x}".format(d.idVendor, d.idProduct)) - return [entry for entry in get_entries(iterator)] + def format_gpu_device_list(iterator): + def get_entries(iterator): + for d in iterator: + if d.idClass == 0x030000: + yield ("{:04x}:{:04x}".format(d.idVendor, d.idProduct)) + return [entry for entry in get_entries(iterator)] -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), - } + 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), + } -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'] - if collect_usb: - usb_devices = format_device_list(usb.core.find(find_all=True)) - else: - usb_device = [] - if collect_pci: - pci_devices = format_device_list(get_pci_devices()) - else: - pci_devices = [] - if collect_modules: - k = kmodpy.Kmod() - modules = [m[0] for m in k.loaded()] - else: - modules = [] - if collect_gpus: - gpus = format_gpu_device_list(get_pci_devices()) - else: - gpus = [] - data = {'usb': usb_devices, 'pci': pci_devices, 'modules': modules, 'gpus': gpus} - module.exit_json(changed=False, ansible_facts=data, msg=data) + 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'] + if collect_usb: + usb_devices = format_device_list(usb.core.find(find_all=True)) + else: + usb_device = [] + if collect_pci: + pci_devices = format_device_list(get_pci_devices()) + else: + pci_devices = [] + if collect_modules: + k = kmodpy.Kmod() + modules = [m[0] for m in k.loaded()] + else: + modules = [] + if collect_gpus: + gpus = format_gpu_device_list(get_pci_devices()) + else: + gpus = [] + data = {'usb': usb_devices, 'pci': pci_devices, 'modules': modules, 'gpus': gpus} + module.exit_json(changed=False, ansible_facts=data, msg=data) -if __name__ == '__main__': - main() + if __name__ == '__main__': + main() diff --git a/library/satip_facts.py b/library/satip_facts.py index 0025178..7b2d4c5 100644 --- a/library/satip_facts.py +++ b/library/satip_facts.py @@ -1,4 +1,3 @@ - #!/usr/bin/env python2 DOCUMENTATION = ''' diff --git a/library/xrandr_facts.py b/library/xrandr_facts.py index 4bcbfb9..f9cf680 100644 --- a/library/xrandr_facts.py +++ b/library/xrandr_facts.py @@ -1,4 +1,3 @@ - #!/usr/bin/env python2 from __future__ import print_function import ast diff --git a/localhost_inventory b/localhost_inventory index 9974433..a51c139 100644 --- a/localhost_inventory +++ b/localhost_inventory @@ -1,3 +1,2 @@ - [localhost] localhost connection=local diff --git a/roles/autoinstall-dvbhddevice/tasks/main.yml b/roles/autoinstall-dvbhddevice/tasks/main.yml index c697e93..0c6bb22 100644 --- a/roles/autoinstall-dvbhddevice/tasks/main.yml +++ b/roles/autoinstall-dvbhddevice/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-dvbhddevice/tasks/main.yml diff --git a/roles/autoinstall-dvbsddevice/tasks/main.yml b/roles/autoinstall-dvbsddevice/tasks/main.yml index ef4fbad..78a7243 100644 --- a/roles/autoinstall-dvbsddevice/tasks/main.yml +++ b/roles/autoinstall-dvbsddevice/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-dvbsddevice/tasks/main.yml diff --git a/roles/autoinstall-imonlcd/tasks/main.yml b/roles/autoinstall-imonlcd/tasks/main.yml index bf16cb9..d5bae07 100644 --- a/roles/autoinstall-imonlcd/tasks/main.yml +++ b/roles/autoinstall-imonlcd/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-imonlcd/tasks/main.yml diff --git a/roles/autoinstall-libcecdaemon/tasks/main.yml b/roles/autoinstall-libcecdaemon/tasks/main.yml index 38d55a2..131abf7 100644 --- a/roles/autoinstall-libcecdaemon/tasks/main.yml +++ b/roles/autoinstall-libcecdaemon/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-libcec-daemon/tasks/main.yml diff --git a/roles/autoinstall-pvr350/tasks/main.yml b/roles/autoinstall-pvr350/tasks/main.yml index f61142d..6a25230 100644 --- a/roles/autoinstall-pvr350/tasks/main.yml +++ b/roles/autoinstall-pvr350/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-pvr350/tasks/main.yml diff --git a/roles/autoinstall-satip/tasks/main.yml b/roles/autoinstall-satip/tasks/main.yml index 9e6b9df..9b3733d 100644 --- a/roles/autoinstall-satip/tasks/main.yml +++ b/roles/autoinstall-satip/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-satip/tasks/main.yml diff --git a/roles/autoinstall-targavfd/tasks/main.yml b/roles/autoinstall-targavfd/tasks/main.yml index 071a8c4..fd30030 100644 --- a/roles/autoinstall-targavfd/tasks/main.yml +++ b/roles/autoinstall-targavfd/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file roles/autoinstall-targavfd/tasks/main.yml diff --git a/roles/autoinstall-ubuntu-drivers/tasks/main.yml b/roles/autoinstall-ubuntu-drivers/tasks/main.yml index f538585..ef82a2e 100644 --- a/roles/autoinstall-ubuntu-drivers/tasks/main.yml +++ b/roles/autoinstall-ubuntu-drivers/tasks/main.yml @@ -1,17 +1,16 @@ + --- + # file roles/autoinstall-ubuntu-drivers/tasks/main.yml ---- -# file roles/autoinstall-ubuntu-drivers/tasks/main.yml + - name: apt | install ubuntu-drivers-common + apt: + name: ubuntu-drivers-common + state: present -- name: apt | install ubuntu-drivers-common - apt: - name: ubuntu-drivers-common - state: present + - name: ensure /etc/yavdr exists + file: + path: /etc/yavdr + state: directory + mode: 0755 -- name: ensure /etc/yavdr exists - file: - path: /etc/yavdr - state: directory - mode: 0755 - -- name: let ubuntu-drivers automatically install additional drivers - command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall + - name: let ubuntu-drivers automatically install additional drivers + command: ubuntu-drivers --package-list /etc/yavdr/autoinstalled autoinstall diff --git a/roles/dvd/tasks/main.yml b/roles/dvd/tasks/main.yml index c789213..a819988 100644 --- a/roles/dvd/tasks/main.yml +++ b/roles/dvd/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file: roles/dvd/tasks/main.yml diff --git a/roles/grub-config/defaults/main.yml b/roles/grub-config/defaults/main.yml index f7a6ab4..61b5b5a 100644 --- a/roles/grub-config/defaults/main.yml +++ b/roles/grub-config/defaults/main.yml @@ -1,4 +1,3 @@ - system: shutdown: poweroff grub: diff --git a/roles/grub-config/handlers/main.yml b/roles/grub-config/handlers/main.yml index 354640d..a7e3e2c 100644 --- a/roles/grub-config/handlers/main.yml +++ b/roles/grub-config/handlers/main.yml @@ -1,4 +1,3 @@ - - name: Update GRUB command: update-grub failed_when: ('error' in grub_register_update.stderr) diff --git a/roles/grub-config/tasks/main.yml b/roles/grub-config/tasks/main.yml index 1268ffe..6a24bad 100644 --- a/roles/grub-config/tasks/main.yml +++ b/roles/grub-config/tasks/main.yml @@ -1,4 +1,3 @@ - - name: custom grub configuration for timeout and reboot halt template: src: templates/50_custom.j2 diff --git a/roles/grub-config/templates/50_custom.j2 b/roles/grub-config/templates/50_custom.j2 index 079cee9..74a944b 100644 --- a/roles/grub-config/templates/50_custom.j2 +++ b/roles/grub-config/templates/50_custom.j2 @@ -1,4 +1,3 @@ - #!/bin/sh exec tail -n +3 $0 diff --git a/roles/kodi/tasks/main.yml b/roles/kodi/tasks/main.yml index 0dca20e..971ac53 100644 --- a/roles/kodi/tasks/main.yml +++ b/roles/kodi/tasks/main.yml @@ -1,4 +1,3 @@ - --- - name: change udev rule to allow KODI to eject optical disks diff --git a/roles/kodi/templates/kodi.service.j2 b/roles/kodi/templates/kodi.service.j2 index a508b24..6549c46 100644 --- a/roles/kodi/templates/kodi.service.j2 +++ b/roles/kodi/templates/kodi.service.j2 @@ -1,4 +1,3 @@ - [Unit] Description=Start kodi in user session diff --git a/roles/nfs-server/tasks/main.yml b/roles/nfs-server/tasks/main.yml index c047b03..cc0be13 100644 --- a/roles/nfs-server/tasks/main.yml +++ b/roles/nfs-server/tasks/main.yml @@ -1,4 +1,3 @@ - - name: install nfs server packages apt: name: '{{ item }}' diff --git a/roles/nfs-server/templates/nfs-exports.j2 b/roles/nfs-server/templates/nfs-exports.j2 index 42f6913..81e8a95 100644 --- a/roles/nfs-server/templates/nfs-exports.j2 +++ b/roles/nfs-server/templates/nfs-exports.j2 @@ -1,5 +1,4 @@ - -/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 %} + /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 %} diff --git a/roles/samba-config/tasks/main.yml b/roles/samba-config/tasks/main.yml index ccbd7f7..b1cfcb0 100644 --- a/roles/samba-config/tasks/main.yml +++ b/roles/samba-config/tasks/main.yml @@ -1,4 +1,3 @@ - # file: roles/samba-config/tasks/main.yml # TODO: diff --git a/roles/samba-config/templates/smb.conf.j2 b/roles/samba-config/templates/smb.conf.j2 index aae856f..befd2b7 100644 --- a/roles/samba-config/templates/smb.conf.j2 +++ b/roles/samba-config/templates/smb.conf.j2 @@ -1,4 +1,3 @@ - {{ ansible_managed_file | comment }} #======================= Global Settings ======================= diff --git a/roles/samba-install/tasks/main.yml b/roles/samba-install/tasks/main.yml index a51e3fe..2c6358a 100644 --- a/roles/samba-install/tasks/main.yml +++ b/roles/samba-install/tasks/main.yml @@ -1,4 +1,3 @@ - # file: roles/samba-install/tasks/main.yml - name: install samba server diff --git a/roles/template-test/defaults/main.yml b/roles/template-test/defaults/main.yml index efd58a0..da426aa 100644 --- a/roles/template-test/defaults/main.yml +++ b/roles/template-test/defaults/main.yml @@ -1,4 +1,3 @@ - foo: - bar - baz diff --git a/roles/template-test/tasks/main.yml b/roles/template-test/tasks/main.yml index 6e321e9..a2a30b2 100644 --- a/roles/template-test/tasks/main.yml +++ b/roles/template-test/tasks/main.yml @@ -1,4 +1,3 @@ - --- - name: show vars debug: diff --git a/roles/template-test/vars/main.yml b/roles/template-test/vars/main.yml deleted file mode 100644 index 0f734b8..0000000 --- a/roles/template-test/vars/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -vars: - foo: - - bar - - baz - - spam diff --git a/roles/vdr/tasks/main.yml b/roles/vdr/tasks/main.yml index 71f9293..e4b3c69 100644 --- a/roles/vdr/tasks/main.yml +++ b/roles/vdr/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file: roles/vdr/tasks/main.yml diff --git a/roles/yavdr-common/defaults/main.yml b/roles/yavdr-common/defaults/main.yml index 64ccb77..1f53b94 100644 --- a/roles/yavdr-common/defaults/main.yml +++ b/roles/yavdr-common/defaults/main.yml @@ -1,4 +1,3 @@ - --- # file: roles/yavdr-common/defaults/main.yml @@ -14,10 +13,10 @@ drivers: sundtek: auto ddvb-dkms: auto -extra_packages: - - vim - - tree - - w-scan + extra_packages: + - vim + - tree + - w-scan vdr: user: vdr diff --git a/roles/yavdr-common/files/90-norecommends.j2 b/roles/yavdr-common/files/90-norecommends.j2 deleted file mode 100644 index a4b9ce7..0000000 --- a/roles/yavdr-common/files/90-norecommends.j2 +++ /dev/null @@ -1,4 +0,0 @@ -// {{ ansible_managed_file }} -// Recommends are as of now still abused in many packages -APT::Install-Recommends "0"; -APT::Install-Suggests "0"; diff --git a/roles/yavdr-common/tasks/main.yml b/roles/yavdr-common/tasks/main.yml index 4d5c5f4..24d4dab 100644 --- a/roles/yavdr-common/tasks/main.yml +++ b/roles/yavdr-common/tasks/main.yml @@ -1,4 +1,3 @@ - - name: apt | prevent automatic installation of recommended packages template: src: templates/90-norecommends.j2 diff --git a/roles/yavdr-common/templates/90-norecommends.j2 b/roles/yavdr-common/templates/90-norecommends.j2 index 5263087..e58919b 100644 --- a/roles/yavdr-common/templates/90-norecommends.j2 +++ b/roles/yavdr-common/templates/90-norecommends.j2 @@ -1,4 +1,3 @@ - {{ ansible_managed_file | comment('c') }} // Recommends are as of now still abused in many packages APT::Install-Recommends "0"; diff --git a/roles/yavdr-network/main.yml b/roles/yavdr-network/main.yml index b69c9b5..8db1b64 100644 --- a/roles/yavdr-network/main.yml +++ b/roles/yavdr-network/main.yml @@ -1,2 +1 @@ - install_avahi: true diff --git a/roles/yavdr-network/tasks/main.yml b/roles/yavdr-network/tasks/main.yml index 6ad1c23..7efe237 100644 --- a/roles/yavdr-network/tasks/main.yml +++ b/roles/yavdr-network/tasks/main.yml @@ -1,4 +1,3 @@ - --- # this playbook sets up network services for a yaVDR installation diff --git a/roles/yavdr-xorg/tasks/main.yml b/roles/yavdr-xorg/tasks/main.yml index 4cf9ddd..ceb5782 100644 --- a/roles/yavdr-xorg/tasks/main.yml +++ b/roles/yavdr-xorg/tasks/main.yml @@ -1,4 +1,3 @@ - --- # file: roles/yavdr-xorg/tasks/main.yml diff --git a/roles/yavdr-xorg/templates/.xinitrc.j2 b/roles/yavdr-xorg/templates/.xinitrc.j2 index 37b71fa..deb9862 100644 --- a/roles/yavdr-xorg/templates/.xinitrc.j2 +++ b/roles/yavdr-xorg/templates/.xinitrc.j2 @@ -1,4 +1,3 @@ - #!/bin/bash # {{ ansible_managed_file }} exec openbox-session diff --git a/roles/yavdr-xorg/templates/autostart.j2 b/roles/yavdr-xorg/templates/autostart.j2 index 6b6c0d7..777c844 100644 --- a/roles/yavdr-xorg/templates/autostart.j2 +++ b/roles/yavdr-xorg/templates/autostart.j2 @@ -1,4 +1,3 @@ - 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 diff --git a/roles/yavdr-xorg/templates/openbox_rc.xml.j2 b/roles/yavdr-xorg/templates/openbox_rc.xml.j2 index d866a8c..e61c42a 100644 --- a/roles/yavdr-xorg/templates/openbox_rc.xml.j2 +++ b/roles/yavdr-xorg/templates/openbox_rc.xml.j2 @@ -1,816 +1,816 @@ - - - - - 10 - 20 - - - yes - - no - - yes - - no - - 200 - - no - - - - Smart - -
yes
- - Active - - Active - -
- - Onyx - NLIMC - - yes - yes - - sans - 8 - - bold - - normal - - - - sans - 8 - - bold - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - normal - - normal - - - - sans - 9 - - bold - - normal - - - - sans - 9 - - bold - - normal - - - - - - 2 - 1 - - + + 10 + 20 + + + yes + + no + + yes + + no + + 200 + + no + + + + Smart + +
yes
+ + Active + + Active + +
+ + Onyx + NLIMC + -
- 875 - -
- - yes - Nonpixel - - Center - - - - 10 - - 10 - - - - - - 0 - 0 - 0 - 0 - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - C-g - - - - left - no - - - - - right - no - - - - - up - no - - - - - down - no - - - - - left - no - - - - - right - no - - - - - up - no - - - - - down - no - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - - - - - - - - - - - - - client-menu - - - - - - scrot -s - - - - - - - - - - - - - - - - - - - - - - - - yes - yes - - - - - - - - - - - right - - - - - left - - - - - up - - - - - down - - - - - - - true - Konqueror - - kfmclient openProfile filemanagement - - - - - - scrot - - - - - 1 - - 500 - - 400 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - + yes + yes + + sans + 8 + + bold + + normal + + + + sans + 8 + + bold + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + normal + + normal + + + + sans + 9 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + + + 2 + 1 + + + + 875 + + + + yes + Nonpixel + + Center + + + + 10 + + 10 + + + + + + 0 + 0 + 0 + 0 + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + C-g + + - previous + left + no - - + + - next + right + no - - + + - previous + up + no - - + + - next + down + no - - + + - previous + left + no - - + + - next + right + no - - - - - - - - - - - - no - - - - - - + + + + up + no - - - - yes - - - - + + + + down + no - - - - - - - - - - - - - - - - - - client-menu + + + + 1 - - - - - - top + + + + 2 - - - - - - left + + + + 3 - - - - - - right + + + + 4 - - - - - - bottom - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vertical - - - - - horizontal - - - - - - - - - - + + + + + + - - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - - - - - - - - - - + + + + + + + - client-list-combined-menu + client-menu - - - - root-menu + + + + + scrot -s - - - - - - previous + + + + + + + + + - - - - next + + + + + + + + - - - - previous + + + + yes + yes + + + + + - - - - next + + + + + right - - - - - - - - /var/lib/openbox/debian-menu.xml - menu.xml - 200 - - no - - 100 - - 400 - - yes - - yes - - - + + + + true + Konqueror + + kfmclient openProfile filemanagement + + + + + + scrot + + + + + 1 + + 500 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + top + + + + + + + left + + + + + + + right + + + + + + + bottom + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + + + horizontal + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + + + root-menu + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + /var/lib/openbox/debian-menu.xml + menu.xml + 200 + + no + + 100 + + 400 + + yes + + yes + + + - - - no true - - yes + # 'Horizontal', 'Vertical' or boolean (yes/no) - - no - true - - yes - - - no - true - - yes - - -
+ + # end of the example + --> + + + no + true + + yes + + + no + true + + yes + + + no + true + + yes + + + diff --git a/roles/yavdr-xorg/templates/vdr-xorg.conf b/roles/yavdr-xorg/templates/vdr-xorg.conf index 94c2104..be7f34b 100644 --- a/roles/yavdr-xorg/templates/vdr-xorg.conf +++ b/roles/yavdr-xorg/templates/vdr-xorg.conf @@ -1,4 +1,3 @@ - # file: roles/yavdr-xorg/templates/vdr-xorg.conf # {{ ansible_managed_file }} diff --git a/roles/yavdr-xorg/templates/x-verbose.service.j2 b/roles/yavdr-xorg/templates/x-verbose.service.j2 deleted file mode 100644 index 028dc95..0000000 --- a/roles/yavdr-xorg/templates/x-verbose.service.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=X with verbose logging on %I -Wants=graphical.target -Before=graphical.target - -[Service] -Type=forking -ExecStart=/usr/bin/x-daemon -logverbose 6 -noreset %I diff --git a/roles/yavdr-xorg/templates/x-verbose@.service.j2 b/roles/yavdr-xorg/templates/x-verbose@.service.j2 index eb7f0c2..028dc95 100644 --- a/roles/yavdr-xorg/templates/x-verbose@.service.j2 +++ b/roles/yavdr-xorg/templates/x-verbose@.service.j2 @@ -1,4 +1,3 @@ - [Unit] Description=X with verbose logging on %I Wants=graphical.target diff --git a/roles/yavdr-xorg/templates/yavdr-desktop.target.j2 b/roles/yavdr-xorg/templates/yavdr-desktop.target.j2 index 72a9ab6..1786c7c 100644 --- a/roles/yavdr-xorg/templates/yavdr-desktop.target.j2 +++ b/roles/yavdr-xorg/templates/yavdr-desktop.target.j2 @@ -1,4 +1,3 @@ - [Unit] Description=yaVDR Desktop Requires=default.target diff --git a/yavdr07.yml b/yavdr07.yml index a2ef381..b4ef79e 100644 --- a/yavdr07.yml +++ b/yavdr07.yml @@ -1,4 +1,3 @@ - --- # file: yavdr07.yml # this playbook sets up a complete yaVDR 0.7 installation