From a0873cfc8ab0f30494c2e47c6f143caf366f05f8 Mon Sep 17 00:00:00 2001
From: Ahmed Abdelhalim <pm@a14m.dev>
Date: Sat, 8 Nov 2025 15:26:02 +0100
Subject: Update gpg role to include smart gpg keys dependencies

---
 roles/gpg/tasks/main.yml  | 16 ++++++++++++++++
 roles/gpg/vars/debian.yml |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/roles/gpg/tasks/main.yml b/roles/gpg/tasks/main.yml
index c16ec636..37db17db 100644
--- a/roles/gpg/tasks/main.yml
+++ b/roles/gpg/tasks/main.yml
@@ -7,3 +7,19 @@
   ansible.builtin.package:
     name: "{{ gpg_packages }}"
     state: "present"
+
+# Disable socket creation by systemd
+# This is done to avoid conflicting sockets for forwarding gpg-agent (for smartcards)
+# Without it, the gpg-agent will listen to these created sockets on startup and causes
+# Warning: remote port forwarding failed for listen path
+- name: Mask GPG agent systemd sockets
+  ansible.builtin.systemd_service:
+    name: "{{ item }}"
+    enabled: false
+    masked: true
+    scope: user
+  loop:
+    - gpg-agent.socket
+    - gpg-agent-ssh.socket
+    - gpg-agent-extra.socket
+    - gpg-agent-browser.socket
diff --git a/roles/gpg/vars/debian.yml b/roles/gpg/vars/debian.yml
index 2b8cd96f..5a960296 100644
--- a/roles/gpg/vars/debian.yml
+++ b/roles/gpg/vars/debian.yml
@@ -2,3 +2,6 @@
 gpg_packages:
   - "gnupg2"
   - "pinentry-tty"
+  - "pcscd"
+  - "scdaemon"
+  - "pcsc-tools"
-- 
cgit v1.2.3