Fix indentations

This commit is contained in:
Alexander Grothe 2017-03-02 09:06:19 +01:00
parent 5219bdc4e5
commit 54c7d091fd
6 changed files with 160 additions and 187 deletions

View File

@ -219,6 +219,7 @@ yavdr-common executes the following tasks:
**** main.yml
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/main.yml :exports none :mkdirp yes
---
# This playbook sets up the basic packages an directories for a yaVDR installation
# file: roles/yavdr-common/tasks/main.yml
#+END_SRC
@ -267,18 +268,10 @@ yavdr-common executes the following tasks:
- wpasupplicant
- usbutils
- xfsprogs
#+END_SRC
***** install and execute local fact scripts
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/main.yml :mkdirp yes
- name: install and execute local fact scripts
- include:
- tasks/local_facts.yml
#+END_SRC
**** local_facts.yml
#+BEGIN_SRC yaml :tangle roles/yavdr-common/tasks/main.yml :exports none :mkdirp yes
---
# file: local_facts.yml
- name: create directory for local facts
file:
dest: /etc/ansible/facts.d
@ -299,6 +292,7 @@ yavdr-common executes the following tasks:
- name: reload ansible local facts
setup: filter=ansible_local
#+END_SRC
*** files:
#+BEGIN_SRC python :tangle roles/yavdr-common/files/hardware.facts.py :mkdirp yes
#!/usr/bin/env python3
@ -541,12 +535,12 @@ After=x@vt7.service
Wants=x@vt7.service
BindsTo=x@vt7.service
#+END_SRC
#+BEGIN_SRC sh :tangle roles/yavdr-xorg/templates/.xinitrc.j2 :mkdirp yes
#+BEGIN_SRC shell :tangle roles/yavdr-xorg/templates/.xinitrc.j2 :mkdirp yes
#!/bin/bash
# {{ ansible_managed_file }}
exec openbox-session
#+END_SRC
#+BEGIN_SRC sh tangle: ansible/yavdr-ansible/roles/yavdr-xorg/templates/autostart.j2 :mkdirp yes
#+BEGIN_SRC shell tangle: ansible/yavdr-ansible/roles/yavdr-xorg/templates/autostart.j2 :mkdirp yes
env | grep "DISPLAY\|DBUS_SESSION_BUS_ADDRESS\|XDG_RUNTIME_DIR" > ~/.session-env
systemctl --user import-environment
#+END_SRC
@ -787,7 +781,7 @@ system:
notify: [ 'Update GRUB' ]
#+END_SRC
*** templates
#+BEGIN_SRC sh :tangle roles/grub-config/templates/50-custom.j2 :mkdirp yes
#+BEGIN_SRC shell :tangle roles/grub-config/templates/50_custom.j2 :mkdirp yes
#!/bin/sh
exec tail -n +3 $0

View File

@ -1,15 +0,0 @@
---
# file: local_facts.yml
- name: create directory for local facts
file:
dest: /etc/ansible/facts.d
state: directory
- name: copy facts script for USB- and PCI(e)-IDs
copy:
src: files/hardware.facts.py
dest: /etc/ansible/facts.d/hardware.facts
mode: '0775'
- name: get local facts
setup:

View File

@ -1,4 +1,5 @@
---
# This playbook sets up the basic packages an directories for a yaVDR installation
# file: roles/yavdr-common/tasks/main.yml
@ -39,13 +40,6 @@
- usbutils
- xfsprogs
- name: install and execute local fact scripts
- include:
- tasks/local_facts.yml
---
# file: local_facts.yml
- name: create directory for local facts
file:
dest: /etc/ansible/facts.d