From d53ddb8da1d41fbfa3935dcc13bf6d234f46d0c2 Mon Sep 17 00:00:00 2001
From: Max Audron <audron@cocaine.farm>
Date: Mon, 2 Oct 2023 14:05:36 +0200
Subject: add and update servers

---
 modules/default.nix          |  1 +
 modules/kubernetes/cri-o.nix |  2 ++
 modules/zfs/default.nix      | 13 -------------
 3 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/default.nix b/modules/default.nix
index b2df22e..54af828 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,5 @@
 {
+  bgp = import ./bgp;
   common = import ./common;
   crypto = import ./crypto;
   gitlab = import ./gitlab;
diff --git a/modules/kubernetes/cri-o.nix b/modules/kubernetes/cri-o.nix
index cc32b26..5062c23 100644
--- a/modules/kubernetes/cri-o.nix
+++ b/modules/kubernetes/cri-o.nix
@@ -3,6 +3,8 @@
 {
   virtualisation.cri-o = {
     enable = true;
+    storageDriver = "overlay";
+    extraPackages = with pkgs; [ fuse3 fuse-overlayfs ];
     settings = {
       crio = {
         network.plugin_dir = "/opt/cni/bin";
diff --git a/modules/zfs/default.nix b/modules/zfs/default.nix
index 4e863fc..7ec3ee9 100644
--- a/modules/zfs/default.nix
+++ b/modules/zfs/default.nix
@@ -16,19 +16,6 @@
     autoScrub.pools = [ "rpool" ];
   };
 
-  virtualisation.containers.storage.settings.storage = {
-    driver = "zfs";
-    graphroot = "/var/lib/containers/storage";
-    runroot = "/run/containers/storage";
-    options.zfs.fsname = "rpool/data/containers";
-    options.zfs.mountopt = "nodev";
-  };
-
-  virtualisation.cri-o = {
-    storageDriver = "zfs";
-    extraPackages = [ pkgs.zfs ];
-  };
-
   fileSystems = {
     "/" = {
       device = "rpool/root";
-- 
cgit v1.2.3