branch master updated: Add new Wireguard peers.

[Mathieu Othacehe]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 74e7adf  Add new Wireguard peers.
74e7adf is described below

commit 74e7adf2fa819003b02b956eb1a2e7d6061f7dfe
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Tue Apr 20 13:41:59 2021 +0200

    Add new Wireguard peers.
    
    * doc/cuirass.org (External machines): Add guix-x15.sjd.se and
    guix-x15b.sjd.se.
    * hydra/berlin.scm: Add those new Wireguard peers.
---
 doc/cuirass.org  | 10 ++++++----
 hydra/berlin.scm | 10 +++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/doc/cuirass.org b/doc/cuirass.org
index 5f35b6a..715b043 100644
--- a/doc/cuirass.org
+++ b/doc/cuirass.org
@@ -15,10 +15,12 @@ network. The next section describes how to add a new 
external machine.
 
 * External machines
 
-| Machine    |  Address | Location |
-|------------+----------+----------|
-| overdrive1 | 10.0.0.3 | Ludo's   |
-| dover      | 10.0.0.4 | Andreas' |
+| Machine          |  Address | Contact         |
+|------------------+----------+-----------------|
+| overdrive1       | 10.0.0.3 | Ludovic Courtès |
+| dover            | 10.0.0.4 | Andreas Enge    |
+| guix-x15.sjd.se  | 10.0.0.5 | Simon Josefsson |
+| guix-x15b.sjd.se | 10.0.0.6 | Simon Josefsson |
 
 * Connect an external machine
 
diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 269cb43..adb89ab 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -391,7 +391,15 @@ Happy hacking!\n"))
                          (wireguard-peer
                           (name "dover")
                           (public-key 
"b3D6Nv5X4npfko99HELdewtKL8LzbbeUAIFjpwU7HhA=")
-                          (allowed-ips '("10.0.0.4/32")))))))
+                          (allowed-ips '("10.0.0.4/32")))
+                         (wireguard-peer
+                          (name "guix-x15.sjd.se")
+                          (public-key 
"pM7dAWXJ35isIDJA3OpbR2YG1Pk3MI9VTlP5ELAeQkM=")
+                          (allowed-ips '("10.0.0.5/32")))
+                         (wireguard-peer
+                          (name "guix-x15b.sjd.se")
+                          (public-key 
"cwRqmMc8IPAHxFCGIt1WcnJnoWJcefcTXte2vMNi6Wo=")
+                          (allowed-ips '("10.0.0.6/32")))))))
 
              (frontend-services %sysadmins
                                 ;; Make sure we get enough build users.