yubikey,gpg: move the yubikey setup scripts to yubikey role

dezeroku · Jul 19, 2024 · 0821086 · 0821086
1 parent 3103b1a
commit 0821086
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/roles/gpg/tasks/main.yml b/roles/gpg/tasks/main.yml
@@ -63,8 +63,6 @@
   loop:
     - scripts/gpg_setup_keyring.sh
     - scripts/gpg_extend_subkeys.sh
-    - scripts/gpg_yubikey_initial_setup.sh
-    - scripts/gpg_yubikey_keytocard.sh
 
 - name: Ensure /usr/local/bin directory exists
   become: true

diff --git a/...iles/scripts/gpg_yubikey_initial_setup.sh → ...iles/scripts/gpg_yubikey_initial_setup.sh b/...iles/scripts/gpg_yubikey_initial_setup.sh → ...iles/scripts/gpg_yubikey_initial_setup.sh
diff --git a/...pg/files/scripts/gpg_yubikey_keytocard.sh → ...ey/files/scripts/gpg_yubikey_keytocard.sh b/...pg/files/scripts/gpg_yubikey_keytocard.sh → ...ey/files/scripts/gpg_yubikey_keytocard.sh
diff --git a/roles/yubikey/meta/main.yaml b/roles/yubikey/meta/main.yaml
@@ -1,3 +1,4 @@
 ---
 dependencies:
   - role: aur_builder
+  - role: gpg
diff --git a/roles/yubikey/tasks/main.yml b/roles/yubikey/tasks/main.yml
@@ -49,6 +49,15 @@
     name: polkit
     state: "{{ (polkit_rules.changed) | ternary('restarted', 'started') }}"
 
+- name: Copy gpg_ scripts
+  ansible.builtin.copy:
+    src: "{{ item }}"
+    dest: "~/scripts/gpg"
+    mode: 0755
+  loop:
+    - scripts/gpg_yubikey_initial_setup.sh
+    - scripts/gpg_yubikey_keytocard.sh
+
 - name: Template sway plugin
   ansible.builtin.include_role:
     name: helper_sway_plugin