01/01: hydra: Update configuration of new berlin frontend.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit 7fab7f21bd208b97ae85200e48d29236941625c2
Author: Ricardo Wurmus <address@hidden>
Date:   Tue Dec 12 18:22:04 2017 +0100

    hydra: Update configuration of new berlin frontend.
    
    * hydra/berlin-new.scm: Fix comments; use ttyS0 for serial
    communication; use 141.80.181.40 as public IP; configure NIC for
    storage connection.
---
 hydra/berlin-new.scm | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/hydra/berlin-new.scm b/hydra/berlin-new.scm
index 7a33709..cddc94a 100644
--- a/hydra/berlin-new.scm
+++ b/hydra/berlin-new.scm
@@ -1,5 +1,5 @@
-;; OS configuration for a new Dell server that will silently replace
-;; "berlin", the frontend of the compile farm hosted at the MDC.
+;; OS configuration for "berlin", the frontend of the compile farm
+;; hosted at the MDC.
 
 (use-modules (gnu) (guix) (sysadmin people))
 (use-service-modules base networking admin mcron shepherd ssh web cuirass)
@@ -180,11 +180,11 @@ Happy hacking!\n"))
   (timezone "Europe/Berlin")
   (locale "en_US.utf8")
 
-  ;; Allow access through the serial console at 141.80.113.141; the
+  ;; Allow access through the serial console at 141.80.167.201; the
   ;; management interface can only be accessed through selected
   ;; servers within the MDC campus network.
   (kernel-arguments '("console=tty0"
-                      "console=ttyS1,115200n8"))
+                      "console=ttyS0,115200"))
 
   ;; The Dell server need these kernel modules for the
   ;; RAID controller.
@@ -226,20 +226,26 @@ Happy hacking!\n"))
   (services (cons*
              (service sysadmin-service-type %sysadmins)
 
-             ;; TODO: configure the second network interface once it's
-             ;; hooked up to the switch.
+             ;; Connection to the DMZ for public access
              (static-networking-service "eno1"
-                                        "141.80.181.41"
+                                        "141.80.181.40"
                                         #:netmask "255.255.255.0"
                                         #:gateway "141.80.181.1")
+             ;; Connection to build nodes
              (static-networking-service "eno3"
                                         "141.80.167.131"
                                         #:netmask "255.255.255.192")
+             ;; Connection to storage head
+             ;; TODO: This should become a bonded interface with
+             ;; enp4s0f0 and enp4s0f1.
+             (static-networking-service "enp4s0f1"
+                                        "192.168.168.2"
+                                        #:netmask "255.255.255.0")
              (service openssh-service-type)
 
              ;; Allow login over serial console.
              (agetty-service (agetty-configuration
-                              (tty "ttyS1")
+                              (tty "ttyS0")
                               (baud-rate "115200")))
 
              ;; The Web service.