[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: hydra: Factorize berlin's 'wireguard-peer' record.
From: |
Ludovic Courtès |
Subject: |
01/02: hydra: Factorize berlin's 'wireguard-peer' record. |
Date: |
Tue, 21 Dec 2021 10:38:29 -0500 (EST) |
civodul pushed a commit to branch master
in repository maintenance.
commit 275a2ac39322bcc24ed9abbde05a44f11630e322
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Dec 21 16:02:55 2021 +0100
hydra: Factorize berlin's 'wireguard-peer' record.
* hydra/dover.scm (berlin-peer): Remove. Use BERLIN-WIREGUARD-PEER
instead.
* hydra/modules/sysadmin/honeycomb.scm (berlin-peer): Likewise.
* hydra/modules/sysadmin/overdrive.scm (berlin-peer): Likewise.
* hydra/bayfront.scm: Use BERLIN-WIREGUARD-PEER instead of the inline
definition.
* hydra/modules/sysadmin/services.scm (berlin-wireguard-peer): New
variable.
---
hydra/bayfront.scm | 9 +--------
hydra/dover.scm | 17 +++++------------
hydra/modules/sysadmin/honeycomb.scm | 11 ++---------
hydra/modules/sysadmin/overdrive.scm | 12 ++----------
hydra/modules/sysadmin/services.scm | 15 +++++++++++++++
5 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index d81555b..2bea4eb 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -905,14 +905,7 @@ access_log /var/log/nginx/bordeaux.access.log;"))
(service wireguard-service-type
(wireguard-configuration
(addresses '("10.0.0.11/32"))
- (peers
- (list
- (wireguard-peer
- (name "peer")
- (endpoint "ci.guix.gnu.org:51820")
- (public-key "wOIfhHqQ+JQmskRS2qSvNRgZGh33UxFDi8uuSXOltF0=")
- (allowed-ips '("10.0.0.1/32"))
- (keep-alive 25))))))
+ (peers (list berlin-wireguard-peer))))
(service openssh-service-type)
(service sysadmin-service-type %sysadmins)
diff --git a/hydra/dover.scm b/hydra/dover.scm
index 50c45bc..3eceed6 100644
--- a/hydra/dover.scm
+++ b/hydra/dover.scm
@@ -1,9 +1,10 @@
;; GuixSD configuration file for the SoftIron OverDrive 1000 build machines.
-;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
-;; Copyright © 2019, 2021 Andreas Enge <andreas@enge.fr`
+;; Copyright © 2016, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
+;; Copyright © 2019, 2021 Andreas Enge <andreas@enge.fr>
;; Released under the GNU GPLv3 or any later version.
-(use-modules (guix) (gnu))
+(use-modules (guix) (gnu)
+ ((sysadmin services) #:select (berlin-wireguard-peer)))
(use-service-modules networking mcron ssh avahi cuirass vpn)
(use-package-modules screen ssh linux vim)
@@ -47,14 +48,6 @@
(string-append #$btrfs-progs "/bin/btrfs balance "
"start -dusage=50 -musage=70 /")))
-(define berlin-peer
- (wireguard-peer
- (name "peer")
- (endpoint "ci.guix.gnu.org:51820")
- (public-key "wOIfhHqQ+JQmskRS2qSvNRgZGh33UxFDi8uuSXOltF0=")
- (allowed-ips '("10.0.0.1/32"))
- (keep-alive 25)))
-
;; The actual machine.
(operating-system
@@ -116,7 +109,7 @@
(service wireguard-service-type
(wireguard-configuration
(addresses '("10.0.0.4/32"))
- (peers (list berlin-peer))))
+ (peers (list berlin-wireguard-peer))))
(modify-services %base-services
(guix-service-type config =>
diff --git a/hydra/modules/sysadmin/honeycomb.scm
b/hydra/modules/sysadmin/honeycomb.scm
index 891a792..c8ab875 100644
--- a/hydra/modules/sysadmin/honeycomb.scm
+++ b/hydra/modules/sysadmin/honeycomb.scm
@@ -31,6 +31,7 @@
#:use-module (gnu services mcron)
#:use-module (gnu services ssh)
#:use-module (gnu services vpn)
+ #:use-module ((sysadmin services) #:select (berlin-wireguard-peer))
#:use-module (guix base32)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -143,14 +144,6 @@
;; Run 'guix gc' at 3AM every day.
#~(job '(next-hour '(3)) "guix gc -F 50G"))
-(define berlin-peer
- (wireguard-peer
- (name "peer")
- (endpoint "ci.guix.gnu.org:51820")
- (public-key "wOIfhHqQ+JQmskRS2qSvNRgZGh33UxFDi8uuSXOltF0=")
- (allowed-ips '("10.0.0.1/32"))
- (keep-alive 25)))
-
(define* (honeycomb-system name #:key wireguard-ip)
(operating-system
(host-name name)
@@ -210,7 +203,7 @@ Match Address 141.80.167.131
(wireguard-configuration
(addresses (list wireguard-ip))
(peers
- (list berlin-peer))))
+ (list berlin-wireguard-peer))))
(service ntp-service-type)
(modify-services %base-services
diff --git a/hydra/modules/sysadmin/overdrive.scm
b/hydra/modules/sysadmin/overdrive.scm
index 919a476..ea42113 100644
--- a/hydra/modules/sysadmin/overdrive.scm
+++ b/hydra/modules/sysadmin/overdrive.scm
@@ -28,6 +28,7 @@
#:use-module (gnu services mcron)
#:use-module (gnu services ssh)
#:use-module (gnu services vpn)
+ #:use-module ((sysadmin services) #:select (berlin-wireguard-peer))
#:export (overdrive-system))
(define (sysadmin name full-name)
@@ -72,15 +73,6 @@
(string-append #$btrfs-progs "/bin/btrfs balance "
"start -dusage=50 -musage=70 /")))
-(define berlin-peer
- (wireguard-peer
- (name "peer")
- (endpoint "ci.guix.gnu.org:51820")
- (public-key "wOIfhHqQ+JQmskRS2qSvNRgZGh33UxFDi8uuSXOltF0=")
- (allowed-ips '("10.0.0.1/32"))
- (keep-alive 25)))
-
-
(define* (overdrive-system name #:key wireguard-ip)
(operating-system
(host-name name)
@@ -141,7 +133,7 @@
(wireguard-configuration
(addresses (list wireguard-ip))
(peers
- (list berlin-peer))))
+ (list berlin-wireguard-peer))))
(service ntp-service-type)
diff --git a/hydra/modules/sysadmin/services.scm
b/hydra/modules/sysadmin/services.scm
index e119b50..097eb56 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -30,6 +30,7 @@
#:use-module (gnu services mcron)
#:use-module (gnu services shepherd)
#:use-module (gnu services ssh)
+ #:use-module (gnu services vpn)
#:use-module (gnu services web)
#:use-module (gnu system shadow)
#:use-module (guix packages)
@@ -48,6 +49,7 @@
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:export (firewall-service
+ berlin-wireguard-peer
disk-space-watchdog-service-type
cuirass-service
frontend-services
@@ -365,6 +367,19 @@
;;;
+;;; Wireguard VPN.
+;;;
+
+(define berlin-wireguard-peer
+ (wireguard-peer
+ (name "peer")
+ (endpoint "ci.guix.gnu.org:51820")
+ (public-key "wOIfhHqQ+JQmskRS2qSvNRgZGh33UxFDi8uuSXOltF0=")
+ (allowed-ips '("10.0.0.1/32"))
+ (keep-alive 25)))
+
+
+;;;
;;; Disk space watchdog.
;;;