diff options
Diffstat (limited to 'roles/init')
-rw-r--r-- | roles/init/tasks/main.yml | 1 | ||||
-rw-r--r-- | roles/init/templates/pam_environment.j2 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml index edbd820..ce56ec4 100644 --- a/roles/init/tasks/main.yml +++ b/roles/init/tasks/main.yml | |||
@@ -3,6 +3,7 @@ | |||
3 | shell: 'GNUPGHOME=$XDG_CONFIG_HOME/gnupg gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"' | 3 | shell: 'GNUPGHOME=$XDG_CONFIG_HOME/gnupg gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"' |
4 | changed_when: false | 4 | changed_when: false |
5 | register: gnupg_runtime_dir_cmd | 5 | register: gnupg_runtime_dir_cmd |
6 | check_mode: no | ||
6 | - name: Add pam_environment | 7 | - name: Add pam_environment |
7 | register: pam_environment | 8 | register: pam_environment |
8 | template: | 9 | template: |
diff --git a/roles/init/templates/pam_environment.j2 b/roles/init/templates/pam_environment.j2 index 4327eeb..fc65a10 100644 --- a/roles/init/templates/pam_environment.j2 +++ b/roles/init/templates/pam_environment.j2 | |||
@@ -38,7 +38,7 @@ GNUPGHOME DEFAULT="${XDG_CONFIG_HOME}/gnupg" | |||
38 | 38 | ||
39 | # SSH | 39 | # SSH |
40 | SSH_AGENT_PID DEFAULT= | 40 | SSH_AGENT_PID DEFAULT= |
41 | SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/gnupg/{{ gnupg_runtime_dir_cmd.get('stdout', debug_gnupg_runtime_dir) }}/S.gpg-agent.ssh" | 41 | SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.gpg-agent.ssh" |
42 | 42 | ||
43 | # Less | 43 | # Less |
44 | LESSHISTFILE DEFAULT="${XDG_STATE_HOME}/less/history" | 44 | LESSHISTFILE DEFAULT="${XDG_STATE_HOME}/less/history" |