From 6c07a429781d4a26a546e3f3049b41e0b968b033 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 4 May 2023 13:39:33 +0200
Subject: [PATCH] different wgautomesh gossip ports for prod and staging

---
 cluster/staging/cluster.nix | 2 ++
 nix/deuxfleurs.nix          | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 2fec94c..362724b 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -38,6 +38,8 @@
       endpoint = "bitfrost.fiber.shirokumo.net:33734";
     };
   };
+
+  deuxfleurs.wgautomeshPort = 1667;
   services.wgautomesh.logLevel = "debug";
 
   # Bootstrap IPs for Consul cluster,
diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix
index 0f5c185..9ef2b2a 100644
--- a/nix/deuxfleurs.nix
+++ b/nix/deuxfleurs.nix
@@ -117,6 +117,11 @@ in
       type = port;
       default = 33799;
     };
+    wgautomeshPort = mkOption {
+      description = "Gossip port for wgautomesh";
+      type = port;
+      default = 1666;
+    };
   };
 
   imports = [
@@ -245,7 +250,7 @@ in
     services.wgautomesh = {
       enable = true;
       interface = "wg0";
-      gossipPort = 1666;
+      gossipPort = cfg.wgautomeshPort;
       gossipSecretFile = "/var/lib/wgautomesh/gossip_secret";
       persistFile = "/var/lib/wgautomesh/state";
       upnpForwardPublicPort =