Cleanup item loop controls

1 files changed, 6 insertions, 14 deletions

diff --git a/roles/gnupg/tasks/main.yml b/roles/gnupg/tasks/main.yml
index 117ebf2..bfbf31a 100644
--- a/roles/gnupg/tasks/main.yml
+++ b/roles/gnupg/tasks/main.yml
@@ -2,21 +2,17 @@
 - name: Config dirs
   file:
     state: directory
-    path: "$XDG_CONFIG_HOME/{{ gnupg_config_item }}"
+    path: "$XDG_CONFIG_HOME/{{ item }}"
     mode: 0700
   loop:
     - gnupg
-  loop_control:
-    loop_var: gnupg_config_item
 - 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: Get gnupg runtime folder name
   shell: 'gpgconf --list-dirs socketdir | sed -e "s@$XDG_RUNTIME_DIR/gnupg/@@"'
   register: gnupg_runtime_dir_cmd
@@ -85,8 +81,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
@@ -94,14 +90,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