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 /lass/1systems/prism | |
| parent | 20e358043546482acfa8c6134f095c1a64ef144d (diff) | |
| parent | e151cfd3298120ec541987d4beb155e18335a0d8 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/prism')
| -rw-r--r-- | lass/1systems/prism/config.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 421afab2a..d43fb804a 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -7,11 +7,12 @@ with import <stockholm/lib>; <stockholm/lass/2configs/retiolum.nix> <stockholm/lass/2configs/libvirt.nix> <stockholm/lass/2configs/tv.nix> + <stockholm/lass/2configs/websites/lassulus.nix> + <stockholm/lass/2configs/telegraf.nix> { services.nginx.enable = true; imports = [ <stockholm/lass/2configs/websites/domsen.nix> - <stockholm/lass/2configs/websites/lassulus.nix> ]; # needed by domsen.nix ^^ lass.usershadow = { @@ -275,19 +276,8 @@ with import <stockholm/lib>; { predicate = "-p udp --dport 60000:61000"; target = "ACCEPT";} ]; } - { - services.murmur = { - enable = true; - bandwidth = 10000000; - registerName = "lassul.us"; - autobanTime = 30; - }; - krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-p tcp --dport 64738"; target = "ACCEPT";} - { predicate = "-p udp --dport 64738"; target = "ACCEPT";} - ]; - - } + <stockholm/lass/2configs/murmur.nix> + <stockholm/lass/2configs/docker.nix> { systemd.services."container@yellow".reloadIfChanged = mkForce false; containers.yellow = { |