guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

26/48: system: hurd: Add openssh service.


From: guix-commits
Subject: 26/48: system: hurd: Add openssh service.
Date: Sun, 19 Apr 2020 10:22:14 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 8b027537a6fd1b2795c534e9a89852da572789b8
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 19 13:15:06 2020 +0200

    system: hurd: Add openssh service.
    
    * gnu/system/hurd.scm (%base-packages/hurd): Add openssh.
    (%hurd-os): Add openssh-service.
    (cross-hurd-image): Generate sshd_config.  Add sshd user.
---
 gnu/system/hurd.scm | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 002aff8..3c8dab6 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -31,11 +31,14 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
   #:use-module (gnu packages hurd)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu services)
   #:use-module (gnu services base)
   #:use-module (gnu services hurd)
   #:use-module (gnu services shepherd)
+  #:use-module (gnu services ssh)
   #:use-module (gnu system)
+  #:use-module (gnu system pam)
   #:use-module (gnu system shadow)
   #:use-module (gnu system vm)
   #:export (cross-hurd-image))
@@ -64,7 +67,7 @@
 (define %base-packages/hurd
   (list hurd bash coreutils file findutils grep sed
         guile-3.0 guile-colorized guile-readline
-        net-base inetutils shepherd))
+        net-base inetutils openssh shepherd))
 
 (define %base-services/hurd
   (list (service hurd-user-processes-service-type)
@@ -77,7 +80,9 @@
                   (guix guix)
                   (extra-options '("--disable-chroot"
                                    "--disable-deduplication"
-                                   "--max-jobs=1"))))))
+                                   "--max-jobs=1"))))
+        (service hurd-loopback-service-type)
+        (syslog-service)))
 
 (define %hurd-os
   (operating-system
@@ -90,7 +95,15 @@
     (timezone "GNUrope")
     (name-service-switch #f)
     (essential-services (hurd-essential-services this-operating-system))
-    (services %base-services/hurd)
+    (services (cons (service openssh-service-type
+                             (openssh-configuration
+                              (use-pam? #f)
+                              (openssh openssh)
+                              (port-number 2222)
+                              (permit-root-login #t)
+                              (allow-empty-passwords? #t)
+                              (password-authentication? #t)))
+                    %base-services/hurd))
     (pam-services '())
     (setuid-programs '())))
 
@@ -132,6 +145,7 @@ fi\n")))
         (account-service (append (operating-system-accounts os)
                                  (operating-system-groups os))
                          (operating-system-skeletons os))
+        (pam-root-service (operating-system-pam-services os))
         (hurd-etc-service os)
         (service profile-service-type
                  (operating-system-packages os))))
@@ -246,6 +260,7 @@ menuentry \"GNU\" {
     (plain-file "passwd"
                 "root:x:0:0:root:/root:/bin/sh
 guixbuilder:x:1:1:guixbuilder:/var/empty:/bin/no-sh
+sshd:x:2:2:sshd:/var/empty:/bin/no-sh
 "))
 
   (define group
@@ -255,7 +270,7 @@ guixbuilder:x:1:1:guixbuilder:/var/empty:/bin/no-sh
 
   (define shadow
     (plain-file "shadow"
-                "root::0:0:0:0:::
+                "root::17873::::::
 "))
 
   ;; XXX This still gives 64bit .go files
@@ -324,6 +339,7 @@ guixbuilder:x:1:1:guixbuilder:/var/empty:/bin/no-sh
                                                        "i586-pc-gnu"))
                                       hurd)
                                     "/etc/ttys"))
+      (directory "/etc/ssh")
       ("/etc/shepherd.conf" -> ,shepherd.conf)
       ("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system
                                                      "i586-pc-gnu"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]