X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=roles%2Fgnupg%2Ftasks%2Fmain.yml;h=5139beffbf003fa0bee15748b4001f636ca5718d;hb=dfd05afe7215e75ba2d34cc4cbc73ed8e10452bf;hp=183dd7dd243d5b406c047fb1fed1df43be9fb6f1;hpb=eac82f289d503c5bcc0d1e04784d027745d371c6;p=perso%2FImmae%2FConfig%2FAnsible.git

diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml
index 183dd7d..5139bef 100644
--- a/roles/gnupg/tasks/main.yml
+++ b/roles/gnupg/tasks/main.yml
@@ -1,18 +1,21 @@
 ---
+- name: Config dirs
+  file:
+    state: directory
+    path: "$XDG_CONFIG_HOME/{{ item }}"
+    mode: 0700
+  loop:
+    - gnupg
 - name: Config files
   copy:
-    src: "gnupg/{{ gnupg_config_item }}"
-    dest: "$XDG_CONFIG_HOME/gnupg/{{ gnupg_config_item }}"
+    src: "gnupg/{{ item }}"
+    dest: "$XDG_CONFIG_HOME/gnupg/{{ item }}"
   loop:
     - gpg-agent.conf
-    - gpg.conf
-  loop_control:
-    loop_var: gnupg_config_item
-- name: Protect directory
-  file:
-    path: $XDG_CONFIG_HOME/gnupg
-    state: directory
-    mode: 0700
+- name: gpg config file
+  template:
+    src: "gpg.conf.j2"
+    dest: "$XDG_CONFIG_HOME/gnupg/gpg.conf"
 - name: Get gnupg runtime folder name
   shell: 'gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"'
   register: gnupg_runtime_dir_cmd
@@ -81,8 +84,8 @@
   block:
     - name: Add systemd overrides
       template:
-        src: "systemd/{{ systemd_item }}.conf.j2"
-        dest: "$XDG_CONFIG_HOME/systemd/user/{{ systemd_item }}.socket.d/override.conf"
+        src: "systemd/{{ item }}.conf.j2"
+        dest: "$XDG_CONFIG_HOME/systemd/user/{{ item }}.socket.d/override.conf"
       register: results
       loop:
         - dirmngr
@@ -90,14 +93,10 @@
         - gpg-agent-browser
         - gpg-agent-extra
         - gpg-agent-ssh
-      loop_control:
-        loop_var: systemd_item
     - name: Restart systemd units
       systemd:
         daemon_reload: true
         scope: user
         state: restarted
-        name: "{{ restart_systemd_item }}.socket"
+        name: "{{ item }}.socket"
       loop: "{{ results.results|selectattr('changed')|map(attribute='item')|list }}"
-      loop_control:
-        loop_var: restart_systemd_item