summaryrefslogtreecommitdiffstats
path: root/krebs/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-09-05 21:34:44 +0200
committermakefu <github@syntax-fehler.de>2021-09-05 21:34:44 +0200
commit7cf2e992f7eb1b90549a80f1a6526f0518d0298b (patch)
tree52e2110a02b554b959ab5a82d848b08ffe53e517 /krebs/1systems
parent357a021c94dd67be170139b6d9da805adb238ebc (diff)
parent06e751c4bbbe4812d6b8c4cf0a964098a68e7b50 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/1systems')
-rw-r--r--krebs/1systems/puyak/config.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 2f122f6ff..ce355998f 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -115,6 +115,9 @@
## Collect local statistics via collectd and send to collectd
<stockholm/krebs/2configs/stats/shack-client.nix>
<stockholm/krebs/2configs/stats/shack-debugging.nix>
+
+ ## shackie irc bot
+ <stockholm/krebs/2configs/shack/reaktor.nix>
];
krebs.build.host = config.krebs.hosts.puyak;
@@ -124,7 +127,6 @@
loader.efi.canTouchEfiVariables = true;
initrd.luks.devices.luksroot.device = "/dev/sda3";
- initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
kernelModules = [ "kvm-intel" ];