frodovdr/yavdr-ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move creation of X11 keyboard configuration to external script

Browse Source 
heredocs with indentations don't work properly in Ansible shell commands
This commit is contained in:
Alexander Grothe 2017-12-17 11:07:40 +01:00
parent f94dd32250
commit b1532f7a7a
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Manual.org
View File

@ -1477,20 +1477,9 @@ b'\xde\xad\xbe\xef'
- "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
- "/etc/X11/xorg.conf.d/"
- name: shell | write keyboard configuration from /etc/default/keyboard to /etc/X11/xorg.conf.d/00-keyboard.conf
shell: |
source /etc/default/keyboard
mkdir -p /etc/X11/xorg.conf.d/
cat > /etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "${XKBLAYOUT}"
Option "XkbModel" "${XKBMODEL}"
Option "XkbVariant" ",${XKBVARIANT}"
Option "XkbOptions" "${XKBOPTIONS}"
EndSection
EOF
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
# Note: write-x11-keyboard-config is in the xlogin package
command: write-x11-keyboard-config
- name: systemd-drop-in | add dependency to X-server for vdr.service
template:

17
roles/yavdr-xorg/tasks/setup-xorg.yml
View File

@ -10,20 +10,9 @@
- "/etc/systemd/system/user@{{ vdr.uid }}.service.d/"
- "/etc/X11/xorg.conf.d/"
- name: shell | write keyboard configuration from /etc/default/keyboard to /etc/X11/xorg.conf.d/00-keyboard.conf
shell: |
source /etc/default/keyboard
mkdir -p /etc/X11/xorg.conf.d/
cat > /etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "${XKBLAYOUT}"
Option "XkbModel" "${XKBMODEL}"
Option "XkbVariant" ",${XKBVARIANT}"
Option "XkbOptions" "${XKBOPTIONS}"
EndSection
EOF
- name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
# Note: write-x11-keyboard-config is in the xlogin package
command: write-x11-keyboard-config
- name: systemd-drop-in | add dependency to X-server for vdr.service
template: