Subject: [bug#61483] [PATCH 2/5] DRAFT gnu: home: services: Add home-ssh-agent-service-type.

From: Janneke Nieuwenhuizen <[email-masked]>
Date: Mon, 13 Feb 2023 17:50:54 +0100

From: "Janneke Nieuwenhuizen" <[email-masked]>

* gnu/home/services/shepherd-xyz.scm
(<home-ssh-agent-configuration>): New type.
(home-ssh-agent-services): New procedure.
(home-ssh-agent-service-type): New variable.
---
 gnu/home/services/shepherd-xyz.scm | 58 +++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/gnu/home/services/shepherd-xyz.scm b/gnu/home/services/shepherd-xyz.scm
index 1bf857b591..38ab7d60ef 100644
--- a/gnu/home/services/shepherd-xyz.scm
+++ b/gnu/home/services/shepherd-xyz.scm
@@ -22,6 +22,7 @@ (define-module (gnu home services shepherd-xyz)
 
   #:use-module (gnu home services)
   #:use-module (gnu home services shepherd)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages version-control)
   #:use-module (gnu services configuration)
   #:use-module (gnu services shepherd)
@@ -29,7 +30,9 @@ (define-module (gnu home services shepherd-xyz)
   #:use-module (guix gexp)
 
   #:export (home-git-daemon-configuration
-            home-git-daemon-service-type))
+            home-git-daemon-service-type
+            home-ssh-agent-configuration
+            home-ssh-agent-service-type))
 
 ;;; Commentary:
 ;;
@@ -43,6 +46,15 @@ (define-module (gnu home services shepherd-xyz)
 ;;          (home-git-configuration
 ;;           (root (string-append (getenv "HOME") "/src"))))
 ;;
+;; Ssh-agent
+;;
+;; Add to your ~/.bash_profile:
+;;
+;; SSH_AUTH_SOCK=${XDG_RUNTIME_DIR-$HOME/.cache}/ssh-agent/socket
+;; export SSH_AUTH_SOCK
+;;
+;; (service home-ssh-agent-service-type)
+;;
 ;;; Code:
 
 ;;;
@@ -100,3 +112,47 @@ (define home-git-daemon-service-type
                              home-git-daemon-services)))
    (description
     "Install and configure the git-daemon as a shepherd service.")))
+
+
+;;;
+;;; Ssh-agent.
+;;;
+(define-record-type* <home-ssh-agent-configuration>
+  home-ssh-agent-configuration make-home-ssh-agent-configuration
+  home-ssh-agent-configuration?
+  (ssh-agent home-ssh-agent-ssh-agent   ;string
+             (default #~(string-append #$openssh "/bin/ssh-agent")))
+  (socket-dir home-ssh-agent-socket-dir ;string
+              (default (string-append %user-runtime-dir "/ssh-agent")))
+  (log-dir home-ssh-agent-log-dir       ;string
+           (default %user-log-dir)))
+
+(define (home-ssh-agent-services config)
+  "Return a <shepherd-service> for an ssh-agent with CONFIG."
+  (match config
+    (($ <home-ssh-agent-configuration> ssh-agent socket-dir log-dir)
+     (list (shepherd-service
+            (documentation "Run the ssh-agent.")
+            (provision '(ssh-agent))
+            (start #~(lambda _
+                       (unless (file-exists? #$socket-dir)
+                         (mkdir-p #$socket-dir)
+                         (chmod #$socket-dir #o700))
+                       (unless (file-exists? #$log-dir)
+                         (mkdir-p #$log-dir))
+                       (fork+exec-command
+                        (list #$ssh-agent
+                              "-D"
+                              "-a" (string-append #$socket-dir "/socket"))
+                        #:log-file (string-append #$log-dir "/ssh-agent.log"))))
+            (stop #~(make-kill-destructor)))))))
+
+(define home-ssh-agent-service-type
+  (service-type
+   (name 'home-ssh-agent)
+   (default-value (home-ssh-agent-configuration))
+   (extensions
+    (list (service-extension home-shepherd-service-type
+                             home-ssh-agent-services)))
+   (description
+    "Install and configure the ssh-agent as a shepherd service.")))
-- 
2.38.1