01/01: hydra: harbourfront: Modernize syntax.

[Andreas Enge]

andreas pushed a commit to branch wip-harbourfront
in repository maintenance.

commit 527851c231f9f7491f7cc0c63dc3cbe3a0ad3c2c
Author: Andreas Enge <andreas@enge.fr>
AuthorDate: Wed Dec 22 10:44:46 2021 +0100

    hydra: harbourfront: Modernize syntax.
    
    * harbourfront.scm: Use targets, static-networking-service-type and
      prohibit-password.
---
 hydra/harbourfront.scm | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/hydra/harbourfront.scm b/hydra/harbourfront.scm
index 54008cb..ae9cd98 100644
--- a/hydra/harbourfront.scm
+++ b/hydra/harbourfront.scm
@@ -13,7 +13,7 @@
 
   (bootloader (bootloader-configuration
                (bootloader grub-bootloader)
-               (target "/dev/sda")
+               (targets '("/dev/sda"))
                (terminal-outputs '(console))))
 
   (file-systems (cons (file-system
@@ -48,15 +48,24 @@
   ;; Globally-installed packages.
   (packages (cons* nss-certs screen openssh vim %base-packages))
 
-  (services (cons* (static-networking-service
-                     "enp12s0f0"
-                     "147.210.17.78"
-                     #:netmask "255.255.254.0"
-                     #:gateway "147.210.17.254"
-                     #:name-servers '("147.210.16.143" "147.210.16.214"))
+  (services (cons* (service static-networking-service-type
+                     (list
+                       (static-networking
+                         (addresses
+                           (list
+                             (network-address
+                               (device "enp12s0f0")
+                               (value "147.210.17.78/23"))))
+                         (routes
+                           (list
+                             (network-route
+                               (destination "default")
+                               (gateway "147.210.17.254"))))
+                         (name-servers
+                           '("147.210.16.143" "147.210.16.214")))))
                    (service openssh-service-type
                      (openssh-configuration
-                       (permit-root-login 'without-password)
+                       (permit-root-login 'prohibit-password)
                        (authorized-keys
                          `(("andreas" ,(local-file "keys/ssh/andreas.pub"))
                            ("cbaines" ,(local-file "keys/ssh/cbaines.pub"))