From 5a39119e2e77d5203b8165a2123d32354043810e Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Sun, 26 Jan 2020 18:34:33 +0100
Subject: [PATCH] Move nfs from storage-ng to server7

---
 host-registry.nix                        |  4 +++-
 hosts/server7/containers/nfs/default.nix | 23 +++++++++++++++++++++++
 hosts/storage-ng/configuration.nix       |  6 ------
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 hosts/server7/containers/nfs/default.nix

diff --git a/host-registry.nix b/host-registry.nix
index 875e08dc..ce95725f 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -12,7 +12,9 @@ rec {
     hydra.publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDhurL/sxsXRglKdLfiWIcK+iqpyhGrGt/MoBODsgvig";
     mpd-index = { };
-    ncdc.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGzWhy2T7avsFf+ZS8R99kah2wPQs7MYWUP+t4VBi28a";
+    nfs = { };
+    ncdc.publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGzWhy2T7avsFf+ZS8R99kah2wPQs7MYWUP+t4VBi28a";
     pulsebert.publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAnEWn/8CKIiCtehh6Ha3XUQqjODj0ygyo3aGAsFWgfG";
     storage-ng.publicKey =
diff --git a/hosts/server7/containers/nfs/default.nix b/hosts/server7/containers/nfs/default.nix
new file mode 100644
index 00000000..f4047864
--- /dev/null
+++ b/hosts/server7/containers/nfs/default.nix
@@ -0,0 +1,23 @@
+name:
+
+(import ../outer-defaults.nix name) // {
+
+  bindMounts."/srv/nfs" = {
+    hostPath = "/srv/ceph/c3d2/nfs";
+    isReadOnly = true;
+  };
+
+  config = { config, pkgs, lib, ... }: {
+    imports = [ ../inner-defaults.nix ];
+
+    c3d2.hq.statistics.enable = true;
+
+    services.nfs.server = {
+      enable = true;
+      exports = "/srv/nfs *(rw)";
+    };
+
+    networking.firewall.enable = false;
+  };
+
+}
diff --git a/hosts/storage-ng/configuration.nix b/hosts/storage-ng/configuration.nix
index bccc08a0..38a5541d 100644
--- a/hosts/storage-ng/configuration.nix
+++ b/hosts/storage-ng/configuration.nix
@@ -106,12 +106,6 @@ in {
     root = "/mnt/cephfs/c3d2/tftp";
   };
 
-  services.nfs.server = {
-    enable = true;
-    #    exports = "/mnt/cephfs/c3d2/dacbert-rootfs dacbert.hq.c3d2.de(rw) *(ro)";
-    exports = "/mnt/cephfs/c3d2/dacbert-rootfs *(rw)";
-  };
-
   services.nginx = {
     enable = true;
     #modules = [ pkgs.nginxModules.nixfancyindex ];