diff options
| author | jeschli <jeschli@gmail.com> | 2018-07-31 16:33:33 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-07-31 16:33:33 +0200 |
| commit | 676f5668de1f15b9297dd5ca36385cbfc0f33d87 (patch) | |
| tree | 132a46ddc2a1863ebe58ab3bdf56c9a06cefab91 /lass/1systems | |
| parent | d34cfa4cc8953ee227f99a36d56ec9335cba532e (diff) | |
| parent | 46e725b6ee1259ad8a0d33f9ffbda6fd1dc2228d (diff) | |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/mors/config.nix | 4 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 19 |
2 files changed, 5 insertions, 18 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 065ab2396..ad4f8a504 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -55,6 +55,7 @@ with import <stockholm/lib>; services.nginx = { enable = true; virtualHosts.default = { + default = true; serverAliases = [ "localhost" "${config.krebs.build.host.name}" @@ -80,9 +81,6 @@ with import <stockholm/lib>; client.enable = true; }; } - { - services.mongodb.enable = true; - } ]; krebs.build.host = config.krebs.hosts.mors; diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 2626ebf33..6be45d38d 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -315,21 +315,6 @@ with import <stockholm/lib>; }; }; } - { #weechat port forwarding to blue - krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-p tcp --dport 9998"; target = "ACCEPT";} - ]; - krebs.iptables.tables.nat.PREROUTING.rules = [ - { v6 = false; precedence = 1000; predicate = "-d ${config.krebs.hosts.prism.nets.internet.ip4.addr} -p tcp --dport 9998"; target = "DNAT --to-destination ${config.krebs.hosts.blue.nets.retiolum.ip4.addr}:9999"; } - ]; - krebs.iptables.tables.filter.FORWARD.rules = [ - { v6 = false; precedence = 1000; predicate = "-d ${config.krebs.hosts.blue.nets.retiolum.ip4.addr} -p tcp --dport 9999"; target = "ACCEPT"; } - { v6 = false; precedence = 1000; predicate = "-s ${config.krebs.hosts.blue.nets.retiolum.ip4.addr}"; target = "ACCEPT"; } - ]; - krebs.iptables.tables.nat.POSTROUTING.rules = [ - { v6 = false; predicate = "-d ${config.krebs.hosts.blue.nets.retiolum.ip4.addr} -p tcp --dport 9999"; target = "MASQUERADE"; } - ]; - } { krebs.iptables.tables.filter.INPUT.rules = [ { predicate = "-p udp --dport 51820"; target = "ACCEPT"; } @@ -376,4 +361,8 @@ with import <stockholm/lib>; krebs.build.host = config.krebs.hosts.prism; # workaround because grub store paths are broken boot.copyKernels = true; + services.earlyoom = { + enable = true; + freeMemThreshold = 5; + }; } |