From 9b59388c3c2a3f512808db2a001ef62fe99fdf0b Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 21 Jul 2024 23:35:11 +0200 Subject: [PATCH] cluster/services/wireguard: move storm from VEGAS/wireguard-server --- cluster/services/wireguard/default.nix | 2 ++ .../default.nix => cluster/services/wireguard/storm.nix | 2 +- hosts/VEGAS/system.nix | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) rename hosts/VEGAS/services/wireguard-server/default.nix => cluster/services/wireguard/storm.nix (92%) diff --git a/cluster/services/wireguard/default.nix b/cluster/services/wireguard/default.nix index 8a0370b..a1f25eb 100644 --- a/cluster/services/wireguard/default.nix +++ b/cluster/services/wireguard/default.nix @@ -66,9 +66,11 @@ in services.wireguard = { nodes = { mesh = [ "checkmate" "grail" "thunderskin" "VEGAS" "prophet" ]; + storm = [ "VEGAS" ]; }; nixos = { mesh = ./mesh.nix; + storm = ./storm.nix; }; secrets.meshPrivateKey = { nodes = config.services.wireguard.nodes.mesh; diff --git a/hosts/VEGAS/services/wireguard-server/default.nix b/cluster/services/wireguard/storm.nix similarity index 92% rename from hosts/VEGAS/services/wireguard-server/default.nix rename to cluster/services/wireguard/storm.nix index 8da670a..e0cb44f 100644 --- a/hosts/VEGAS/services/wireguard-server/default.nix +++ b/cluster/services/wireguard/storm.nix @@ -6,7 +6,7 @@ let in { age.secrets.wireguard-key-storm = { - file = ../../../../secrets + "/wireguard-key-storm-${hostName}.age"; + file = ../../../secrets + "/wireguard-key-storm-${hostName}.age"; mode = "0400"; }; diff --git a/hosts/VEGAS/system.nix b/hosts/VEGAS/system.nix index 8755edf..4ee25df 100644 --- a/hosts/VEGAS/system.nix +++ b/hosts/VEGAS/system.nix @@ -20,7 +20,6 @@ ./services/jokes ./services/minecraft ./services/websites - ./services/wireguard-server depot.nixosModules.hyprspace depot.nixosModules.nix-builder