From 24346cccad290ddc014d2fed09ed5cfde6275adb Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Apr 2023 13:26:52 +0200
Subject: cleanup and add garage cluster container module

---
 nixos/Makefile           |  2 +-
 nixos/garage-cluster.nix |  1 +
 nixos/kusanagi.nix       |  1 -
 nixos/lindy.nix          |  2 +-
 nixos/route48.nix        | 13 -------------
 5 files changed, 3 insertions(+), 16 deletions(-)
 create mode 120000 nixos/garage-cluster.nix
 delete mode 100644 nixos/route48.nix

(limited to 'nixos')

diff --git a/nixos/Makefile b/nixos/Makefile
index 4c86e58..a0f2628 100644
--- a/nixos/Makefile
+++ b/nixos/Makefile
@@ -5,7 +5,7 @@ boot:
 	sudo nixos-rebuild boot -I nixos-config=`hostname`.nix
 
 test:
-	nixos-rebuild build -I nixos-config=`hostname`.nix
+	nixos-rebuild build -I nixpkgs=${HOME}/dev/nixpkgs -I nixos-config=`hostname`.nix
 
 up:
 	sudo nixos-rebuild boot --upgrade -I nixos-config=`hostname`.nix
diff --git a/nixos/garage-cluster.nix b/nixos/garage-cluster.nix
new file mode 120000
index 0000000..9dd5932
--- /dev/null
+++ b/nixos/garage-cluster.nix
@@ -0,0 +1 @@
+/home/lx/Deuxfleurs/garage/script/jepsen.garage/garage-cluster.nix
\ No newline at end of file
diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix
index 750c6a7..84a501d 100644
--- a/nixos/kusanagi.nix
+++ b/nixos/kusanagi.nix
@@ -9,7 +9,6 @@
     ./common.nix
     ./kde.nix
     #./gnome.nix
-    #./route48.nix
   ];
 
   networking.hostName = "kusanagi";
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
index 5c1f5ab..0705501 100644
--- a/nixos/lindy.nix
+++ b/nixos/lindy.nix
@@ -10,7 +10,7 @@
     ./kde.nix
     #./gnome.nix
     #./fdn-vpn.nix
-    #./route48.nix
+    ./garage-cluster.nix
   ];
 
   networking.hostName = "lindy";
diff --git a/nixos/route48.nix b/nixos/route48.nix
deleted file mode 100644
index 3dbdb44..0000000
--- a/nixos/route48.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-{
-  networking.wg-quick.interfaces.route48 = {
-    privateKeyFile = "/root/route48private";
-    address = [ "2a06:a004:3089::2/48" ];
-    peers = [{
-      publicKey = "W0pI832mL5u7JzJjiE68dyS95mIGBDqGgSxSZromEGY=";
-      allowedIPs = ["::/1"  "8000::/1"]; 
-      endpoint = "par-fr.node.route48.org:51890";
-      persistentKeepalive = 60;
-    }];
-  };
-}
-- 
cgit v1.2.3