diff options
Diffstat (limited to 'roles/gnupg')
-rw-r--r-- | roles/gnupg/tasks/main.yml | 2 | ||||
-rw-r--r-- | roles/gnupg/templates/systemd/dirmngr.conf.j2 | 2 | ||||
-rw-r--r-- | roles/gnupg/templates/systemd/gpg-agent-browser.conf.j2 | 2 | ||||
-rw-r--r-- | roles/gnupg/templates/systemd/gpg-agent-extra.conf.j2 | 2 | ||||
-rw-r--r-- | roles/gnupg/templates/systemd/gpg-agent-ssh.conf.j2 | 2 | ||||
-rw-r--r-- | roles/gnupg/templates/systemd/gpg-agent.conf.j2 | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml index d1289f5..ef61fed 100644 --- a/roles/gnupg/tasks/main.yml +++ b/roles/gnupg/tasks/main.yml | |||
@@ -15,11 +15,13 @@ | |||
15 | shell: 'gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"' | 15 | shell: 'gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"' |
16 | register: gnupg_runtime_dir_cmd | 16 | register: gnupg_runtime_dir_cmd |
17 | changed_when: false | 17 | changed_when: false |
18 | check_mode: no | ||
18 | - name: check existing secret key | 19 | - name: check existing secret key |
19 | shell: "gpg --list-secret-keys | grep '{{ gpg_useremail }}'" | 20 | shell: "gpg --list-secret-keys | grep '{{ gpg_useremail }}'" |
20 | changed_when: false | 21 | changed_when: false |
21 | ignore_errors: true | 22 | ignore_errors: true |
22 | register: gpgkeys | 23 | register: gpgkeys |
24 | check_mode: no | ||
23 | - name: ask for gpg password | 25 | - name: ask for gpg password |
24 | pause: | 26 | pause: |
25 | prompt: "Chose gpg password" | 27 | prompt: "Chose gpg password" |
diff --git a/roles/gnupg/templates/systemd/dirmngr.conf.j2 b/roles/gnupg/templates/systemd/dirmngr.conf.j2 index 9083ab5..529fdd7 100644 --- a/roles/gnupg/templates/systemd/dirmngr.conf.j2 +++ b/roles/gnupg/templates/systemd/dirmngr.conf.j2 | |||
@@ -1,3 +1,3 @@ | |||
1 | [Socket] | 1 | [Socket] |
2 | ListenStream= | 2 | ListenStream= |
3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.get('stdout', debug_gnupg_runtime_dir) }}/S.dirmngr | 3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.dirmngr |
diff --git a/roles/gnupg/templates/systemd/gpg-agent-browser.conf.j2 b/roles/gnupg/templates/systemd/gpg-agent-browser.conf.j2 index 61ddeb6..6dbbbc7 100644 --- a/roles/gnupg/templates/systemd/gpg-agent-browser.conf.j2 +++ b/roles/gnupg/templates/systemd/gpg-agent-browser.conf.j2 | |||
@@ -1,3 +1,3 @@ | |||
1 | [Socket] | 1 | [Socket] |
2 | ListenStream= | 2 | ListenStream= |
3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.get('stdout', debug_gnupg_runtime_dir) }}/S.gpg-agent.browser | 3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.gpg-agent.browser |
diff --git a/roles/gnupg/templates/systemd/gpg-agent-extra.conf.j2 b/roles/gnupg/templates/systemd/gpg-agent-extra.conf.j2 index f34606c..fbd5dee 100644 --- a/roles/gnupg/templates/systemd/gpg-agent-extra.conf.j2 +++ b/roles/gnupg/templates/systemd/gpg-agent-extra.conf.j2 | |||
@@ -1,3 +1,3 @@ | |||
1 | [Socket] | 1 | [Socket] |
2 | ListenStream= | 2 | ListenStream= |
3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.get('stdout', debug_gnupg_runtime_dir) }}/S.gpg-agent.extra | 3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.gpg-agent.extra |
diff --git a/roles/gnupg/templates/systemd/gpg-agent-ssh.conf.j2 b/roles/gnupg/templates/systemd/gpg-agent-ssh.conf.j2 index b7cd0c2..6f37eaa 100644 --- a/roles/gnupg/templates/systemd/gpg-agent-ssh.conf.j2 +++ b/roles/gnupg/templates/systemd/gpg-agent-ssh.conf.j2 | |||
@@ -1,3 +1,3 @@ | |||
1 | [Socket] | 1 | [Socket] |
2 | ListenStream= | 2 | ListenStream= |
3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.get('stdout', debug_gnupg_runtime_dir) }}/S.gpg-agent.ssh | 3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.gpg-agent.ssh |
diff --git a/roles/gnupg/templates/systemd/gpg-agent.conf.j2 b/roles/gnupg/templates/systemd/gpg-agent.conf.j2 index 666c22e..4f085da 100644 --- a/roles/gnupg/templates/systemd/gpg-agent.conf.j2 +++ b/roles/gnupg/templates/systemd/gpg-agent.conf.j2 | |||
@@ -1,3 +1,3 @@ | |||
1 | [Socket] | 1 | [Socket] |
2 | ListenStream= | 2 | ListenStream= |
3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.get('stdout', debug_gnupg_runtime_dir) }}/S.gpg-agent | 3 | ListenStream=%t/gnupg/{{ gnupg_runtime_dir_cmd.stdout }}/S.gpg-agent |