diff options
| author | tv <tv@krebsco.de> | 2021-09-28 22:48:17 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2021-09-28 22:48:17 +0200 |
| commit | ed2c6bd9792afbc433ae4eb23f40e17b90420f99 (patch) | |
| tree | 289de32dd7f58f46accf7ad25ed184db5aa45198 /krebs/1systems | |
| parent | 20e358043546482acfa8c6134f095c1a64ef144d (diff) | |
| parent | e151cfd3298120ec541987d4beb155e18335a0d8 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/1systems')
| -rw-r--r-- | krebs/1systems/hotdog/config.nix | 3 | ||||
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 3 | ||||
| -rw-r--r-- | krebs/1systems/test-all-krebs-modules/config.nix | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index a100e414d..9f1ac9134 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -10,6 +10,9 @@ <stockholm/krebs/2configs/ircd.nix> <stockholm/krebs/2configs/reaktor2.nix> <stockholm/krebs/2configs/wiki.nix> + + ## shackie irc bot + <stockholm/krebs/2configs/shack/reaktor.nix> ]; krebs.build.host = config.krebs.hosts.hotdog; diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 2f122f6ff..5ed946aca 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -109,7 +109,7 @@ <stockholm/krebs/2configs/shack/prometheus/node.nix> <stockholm/krebs/2configs/shack/prometheus/server.nix> <stockholm/krebs/2configs/shack/prometheus/blackbox.nix> - <stockholm/krebs/2configs/shack/prometheus/unifi.nix> + #<stockholm/krebs/2configs/shack/prometheus/unifi.nix> <stockholm/krebs/2configs/shack/prometheus/alertmanager-telegram.nix> ## Collect local statistics via collectd and send to collectd @@ -124,7 +124,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" ]; diff --git a/krebs/1systems/test-all-krebs-modules/config.nix b/krebs/1systems/test-all-krebs-modules/config.nix index 2e1b5c1ad..8495a3ded 100644 --- a/krebs/1systems/test-all-krebs-modules/config.nix +++ b/krebs/1systems/test-all-krebs-modules/config.nix @@ -10,7 +10,6 @@ in { enable = true; build.user = config.krebs.users.krebs; build.host = config.krebs.hosts.test-all-krebs-modules; - Reaktor.test = {}; apt-cacher-ng.enable = true; backup.enable = true; bepasty.enable = true; |