services: autossh: Add shepherd-provision configuration option.

Allow to have several autossh services in system configuration.

gnu/services/ssh.scm (autossh-configuration)[shepherd-provision]: New field.
(autossh-file-name): Use first symbol from shepherd-provision as a base name
for the runtime autossh directory.
(autossh-shepherd-service)[shepherd-service]{provision}: Set to shepherd-provison.
doc/guix.texi (Networking Services)[autossh-configuration]: Document it.

Merges: !9285
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>

1 files changed, 9 insertions, 5 deletions

diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 675a15b6350..ddb985e51bb 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -624,19 +624,23 @@ object."
   (ssh-options     autossh-configuration-ssh-options
                    (default '()))
   (auto-start?     autossh-configuration-auto-start?
-                   (default #t)))
+                   (default #t))
+  (shepherd-provision autossh-configuration-shepherd-provision
+                   (default '(autossh))))
 
 (define (autossh-file-name config file)
   "Return a path in /var/run/autossh/ that is writable
    by @code{user} from @code{config}."
-  (string-append "/var/run/autossh/"
-                 (autossh-configuration-user config)
-                 "/" file))
+  (string-append "/var/run/"
+                 (symbol->string
+                  (first (autossh-configuration-shepherd-provision config))) "/"
+                 (autossh-configuration-user config) "/"
+                 file))
 
 (define (autossh-shepherd-service config)
   (shepherd-service
    (documentation "Automatically set up ssh connections (and keep them alive).")
-   (provision '(autossh))
+   (provision (autossh-configuration-shepherd-provision config))
    (requirement '(user-processes))
    (start #~(make-forkexec-constructor
              (list #$(file-append autossh "/bin/autossh")