summaryrefslogtreecommitdiff
path: root/roles/init
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@fretlink.com>2018-11-18 13:14:33 +0100
committerIsmaël Bouya <ismael.bouya@fretlink.com>2018-11-18 13:20:49 +0100
commit853c14457ef51fbca58f9c4fb5c1a255e68d7c87 (patch)
tree28d3760ae94b3c13942d71ac75bf65b985f1dd3c /roles/init
parent1a48017dde54325c5619f45f925478e7c3143ba8 (diff)
downloadAnsible-853c14457ef51fbca58f9c4fb5c1a255e68d7c87.tar.gz
Ansible-853c14457ef51fbca58f9c4fb5c1a255e68d7c87.tar.zst
Ansible-853c14457ef51fbca58f9c4fb5c1a255e68d7c87.zip
Make bash xdg-compliant
Diffstat (limited to 'roles/init')
-rw-r--r--roles/init/tasks/main.yml1
-rw-r--r--roles/init/templates/pam_environment.j23
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml
index a52f3cd..e60bb2a 100644
--- a/roles/init/tasks/main.yml
+++ b/roles/init/tasks/main.yml
@@ -9,7 +9,6 @@
9 - "$XDG_STATE_HOME/bash" 9 - "$XDG_STATE_HOME/bash"
10 - "$XDG_DATA_HOME" 10 - "$XDG_DATA_HOME"
11 - "$XDG_CACHE_HOME" 11 - "$XDG_CACHE_HOME"
12 - "$HOME/Desktop"
13 - "$HOME/Downloads" 12 - "$HOME/Downloads"
14- name: Get gnupg runtime folder name 13- name: Get gnupg runtime folder name
15 shell: 'GNUPGHOME=$XDG_CONFIG_HOME/gnupg gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"' 14 shell: 'GNUPGHOME=$XDG_CONFIG_HOME/gnupg gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"'
diff --git a/roles/init/templates/pam_environment.j2 b/roles/init/templates/pam_environment.j2
index 5bb8895..c257045 100644
--- a/roles/init/templates/pam_environment.j2
+++ b/roles/init/templates/pam_environment.j2
@@ -19,6 +19,9 @@ BROWSER DEFAULT="firefox"
19# replace GIO with xdg-open, see tools/files/gio_unwrapper.sh 19# replace GIO with xdg-open, see tools/files/gio_unwrapper.sh
20GIO_LAUNCH_DESKTOP DEFAULT=gio_unwrapper 20GIO_LAUNCH_DESKTOP DEFAULT=gio_unwrapper
21 21
22# Readline
23INPUTRC DEFAULT="${XDG_CONFIG_HOME}/inputrc"
24
22# Ansible 25# Ansible
23ANSIBLE_CONFIG DEFAULT="${XDG_CONFIG_HOME}/ansible/ansible.cfg" 26ANSIBLE_CONFIG DEFAULT="${XDG_CONFIG_HOME}/ansible/ansible.cfg"
24 27