From 6c12a71ecb8234bf4bf933bccc8f368cf31aa3f9 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 13 Jun 2023 11:56:10 +0200
Subject: Deploy nixos 23.05 on staging and other staging fixes

---
 cluster/staging/cluster.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cluster/staging/cluster.nix')

diff --git a/cluster/staging/cluster.nix b/cluster/staging/cluster.nix
index 362724b..05ded05 100644
--- a/cluster/staging/cluster.nix
+++ b/cluster/staging/cluster.nix
@@ -40,7 +40,7 @@
   };
 
   deuxfleurs.wgautomeshPort = 1667;
-  services.wgautomesh.logLevel = "debug";
+  deuxfleurs.services.wgautomesh.logLevel = "debug";
 
   # Bootstrap IPs for Consul cluster,
   # these are IPs on the Wireguard overlay
@@ -139,7 +139,8 @@
           port = substituter_port;
           openFirewall = false;
           bindAddress = "0.0.0.0";
-          package = pkgs.haskellPackages.nix-serve-ng;
+          #package = pkgs.haskellPackages.nix-serve-ng;
+          #package = pkgs.nix-serve-ng.override { nix = pkgs.nixVersions.nix_2_12; };
         };
         nix.settings.substituters = map
             ({ address, ... }: "http://${address}:${builtins.toString substituter_port}")
-- 
cgit v1.2.3