l prism.r: fix mdmonitor service error

3 files changed, 6 insertions, 54 deletions

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 356b8d182..45f9ae00e 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -123,16 +123,6 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/ciko.nix>
     <stockholm/lass/2configs/container-networking.nix>
     <stockholm/lass/2configs/jitsi.nix>
-    { # quasi bepasty.nix
-      imports = [
-        <stockholm/lass/2configs/bepasty.nix>
-      ];
-      krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
-        if ( $server_addr = "${config.krebs.build.host.nets.internet.ip4.addr}" ) {
-          return 403;
-        }
-      '';
-    }
     {
       services.tor = {
         enable = true;
diff --git a/lass/1systems/prism/physical.nix b/lass/1systems/prism/physical.nix
index 1a3bee850..26ecd1cda 100644
--- a/lass/1systems/prism/physical.nix
+++ b/lass/1systems/prism/physical.nix
@@ -65,6 +65,12 @@
     fsType = "ext4";
   };
 
+  # silence mdmonitor.service failures
+  # https://github.com/NixOS/nixpkgs/issues/72394
+  environment.etc."mdadm.conf".text = ''
+    MAILADDR root
+  '';
+
   nix.maxJobs = lib.mkDefault 8;
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
diff --git a/lass/2configs/bepasty.nix b/lass/2configs/bepasty.nix
deleted file mode 100644
index 9bd416c05..000000000
--- a/lass/2configs/bepasty.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
-
-# secrets used:
-#   wildcard.krebsco.de.crt
-#   wildcard.krebsco.de.key
-#   bepasty-secret.nix     <- contains single string
-
-with import <stockholm/lib>;
-let
-  secKey = import <secrets/bepasty-secret.nix>;
-  ext-doms = [
-    "paste.lassul.us"
-    "paste.krebsco.de"
-  ];
-in {
-
-  services.nginx.enable = mkDefault true;
-  krebs.bepasty = {
-    enable = true;
-    serveNginx= true;
-
-    servers = {
-      "paste.r" = {
-        nginx = {
-          serverAliases = [
-            "paste.${config.krebs.build.host.name}"
-            "paste.r"
-          ];
-        };
-        defaultPermissions = "admin,list,create,read,delete";
-        secretKey = secKey;
-      };
-    } //
-    genAttrs ext-doms (ext-dom: {
-      nginx = {
-        forceSSL = true;
-        enableACME = true;
-      };
-      defaultPermissions = "read,create";
-      secretKey = secKey;
-    });
-  };
-}