Actually include SSH server in default configuration.

* configure.ac (AC_INIT): Bump version. * examples/dynamic.scm (services): Add OPENSSH-SERVICE-TYPE.
mbakke · May 31, 2019 · c55e0da · c55e0da
1 parent ef6c540
commit c55e0da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(ganeti-instance-guix, 0.3)
+AC_INIT(ganeti-instance-guix, 0.3.1)
 
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR(configure)

diff --git a/examples/dynamic.scm b/examples/dynamic.scm
@@ -2,7 +2,7 @@
              (srfi srfi-60)
              (rnrs io ports))
 (use-package-modules certs)
-(use-service-modules networking)
+(use-service-modules networking ssh)
 
 (define (cidr->netmask address)
   "Convert a CIDR specification such as 10.0.0.0/24 to 255.255.255.0."
@@ -35,10 +35,16 @@
   (packages (append (list nss-certs)
                     %base-packages))
 
-  (services (cons (static-networking-service
-                   "eth0"
-                   (getenv "NIC_0_IP")
-                   #:netmask (cidr->netmask (getenv "NIC_0_NETWORK_SUBNET"))
-                   #:gateway (getenv "NIC_0_NETWORK_GATEWAY")
-                   #:name-servers (list (getenv "NIC_0_NETWORK_GATEWAY")))
-                  %base-services)))
+  (services (cons*
+             (static-networking-service
+              "eth0"
+              (getenv "NIC_0_IP")
+              #:netmask (cidr->netmask (getenv "NIC_0_NETWORK_SUBNET"))
+              #:gateway (getenv "NIC_0_NETWORK_GATEWAY")
+              #:name-servers (list (getenv "NIC_0_NETWORK_GATEWAY")))
+             (service openssh-service-type
+                      (openssh-configuration
+                       (permit-root-login 'without-password)
+                       (authorized-keys
+                        `(("root" ,(local-file "/root/.ssh/authorized_keys"))))))
+             %base-services)))