From c3953b399586111a450b2ce6f5c2e397423082d0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 22 Nov 2022 00:17:40 +0100
Subject: l shodan.r: remove broken cryptoModules config

---
 lass/1systems/shodan/physical.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/1systems/shodan')

diff --git a/lass/1systems/shodan/physical.nix b/lass/1systems/shodan/physical.nix
index 55e91b0e4..bc7e29db6 100644
--- a/lass/1systems/shodan/physical.nix
+++ b/lass/1systems/shodan/physical.nix
@@ -11,7 +11,6 @@
     loader.grub.device = "/dev/sda";
 
     initrd.luks.devices.lusksroot.device = "/dev/sda2";
-    initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
     initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
   };
   fileSystems = {
-- 
cgit v1.3.1


From 21726195bf1c4602e42a9cac9bef24352dc10a5f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 22 Nov 2022 00:17:56 +0100
Subject: l shodan.r: remove tmpfs on /tmp

---
 lass/1systems/shodan/physical.nix | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'lass/1systems/shodan')

diff --git a/lass/1systems/shodan/physical.nix b/lass/1systems/shodan/physical.nix
index bc7e29db6..f94edcf9b 100644
--- a/lass/1systems/shodan/physical.nix
+++ b/lass/1systems/shodan/physical.nix
@@ -27,11 +27,6 @@
       fsType = "btrfs";
       options = ["defaults" "noatime" "ssd" "compress=lzo"];
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
     "/bku" = {
       device = "/dev/pool/bku";
       fsType = "btrfs";
-- 
cgit v1.3.1


From 9249f80fddac60751a6319c763c2371d313cd789 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 22 Nov 2022 00:19:44 +0100
Subject: l shodan.r: use samba instead of nfs for prism

---
 lass/1systems/shodan/config.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lass/1systems/shodan')

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index 5d6a440e0..0505f18c6 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -1,6 +1,5 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
 {
   imports = [
     <stockholm/lass>
@@ -17,7 +16,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/blue-host.nix>
     <stockholm/lass/2configs/green-host.nix>
     <stockholm/krebs/2configs/news-host.nix>
-    <stockholm/lass/2configs/nfs-dl.nix>
+    <stockholm/lass/2configs/prism-mounts/samba.nix>
     <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/home-media.nix>
     <stockholm/lass/2configs/syncthing.nix>
-- 
cgit v1.3.1


From 183052aba03867be98b8d1f1aad52ffb9c46afd3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 22 Nov 2022 00:20:33 +0100
Subject: l shodan.r: sync-containers2 -> sync-containers3

---
 lass/1systems/shodan/config.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lass/1systems/shodan')

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index 0505f18c6..ef538f339 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -18,9 +18,8 @@
     <stockholm/krebs/2configs/news-host.nix>
     <stockholm/lass/2configs/prism-mounts/samba.nix>
     <stockholm/lass/2configs/fetchWallpaper.nix>
-    <stockholm/lass/2configs/home-media.nix>
-    <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/sync/sync.nix>
+    <stockholm/lass/2configs/consul.nix>
+    <stockholm/lass/2configs/red-host.nix>
     <stockholm/lass/2configs/snapclient.nix>
   ];
 
-- 
cgit v1.3.1

[cgit] Unable to lock slot /tmp/cgit/9a300000.lock: No such file or directory (2)