Deploy nixos 23.05 on staging and other staging fixes

4 files changed, 7 insertions, 6 deletions

diff --git a/cluster/staging/app/core/deploy/d53.hcl b/cluster/staging/app/core/deploy/d53.hcl
index fb1c1bf..d8dbed7 100644
--- a/cluster/staging/app/core/deploy/d53.hcl
+++ b/cluster/staging/app/core/deploy/d53.hcl
@@ -1,4 +1,4 @@
-job "core:d53" {
+job "core-d53" {
   datacenters = ["neptune", "jupiter", "corrin", "bespin"]
   type = "service"
   priority = 90
diff --git a/cluster/staging/app/core/deploy/diplonat.hcl b/cluster/staging/app/core/deploy/diplonat.hcl
index ba1e4b5..be51f60 100644
--- a/cluster/staging/app/core/deploy/diplonat.hcl
+++ b/cluster/staging/app/core/deploy/diplonat.hcl
@@ -1,4 +1,4 @@
-job "core:diplonat" {
+job "core-diplonat" {
   datacenters = ["neptune", "jupiter", "corrin", "bespin"]
   type = "system"
   priority = 90
diff --git a/cluster/staging/app/core/deploy/tricot.hcl b/cluster/staging/app/core/deploy/tricot.hcl
index 7547a53..dc15d54 100644
--- a/cluster/staging/app/core/deploy/tricot.hcl
+++ b/cluster/staging/app/core/deploy/tricot.hcl
@@ -1,4 +1,4 @@
-job "core:tricot" {
+job "core-tricot" {
   datacenters = ["neptune", "jupiter", "corrin", "bespin"]
   type = "system"
   priority = 90
@@ -25,7 +25,7 @@ job "core:tricot" {
 
       config {
         packages = [
-          "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=f163d1d348c78a27bb19a86a6158f4b5d1287f6f"
+          "git+https://git.deuxfleurs.fr/Deuxfleurs/tricot.git?ref=main&rev=3999723308da10e564c4634997c6ecf63f2839d4"
         ]
         command = "tricot"
         # cap_add = [ "net_bind_service" ]  # this doesn't work for whatever reason, so we need to put user = "root" instead
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}")