diff options
| author | makefu <github@syntax-fehler.de> | 2018-12-19 14:10:21 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-12-19 14:10:21 +0100 |
| commit | b7529f97e118f1b4da91acae2c21a06eae6e5638 (patch) | |
| tree | b368295e641d65b7303cb987be85f80c3c62cd9b /lass/1systems | |
| parent | 5299bd93a0240580bc1aec377436c44273f144e5 (diff) | |
| parent | dc79107558105a3b6afb558f194965fcb3867542 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/littleT/config.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/prism/config.nix | 6 | ||||
| -rw-r--r-- | lass/1systems/skynet/config.nix | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lass/1systems/littleT/config.nix b/lass/1systems/littleT/config.nix index 2f28cc0d6..7fe143c3c 100644 --- a/lass/1systems/littleT/config.nix +++ b/lass/1systems/littleT/config.nix @@ -6,6 +6,7 @@ with import <stockholm/lib>; <stockholm/lass> <stockholm/lass/2configs/retiolum.nix> + <stockholm/lass/2configs/blue-host.nix> ]; networking.networkmanager.enable = true; diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 962a77cc2..6c454b4ac 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -298,15 +298,15 @@ with import <stockholm/lib>; } { imports = [ - <stockholm/lass/2configs/wirelum.nix> + <stockholm/lass/2configs/wiregrill.nix> ]; krebs.iptables.tables.nat.PREROUTING.rules = [ { v6 = false; precedence = 1000; predicate = "-s 10.244.1.0/24"; target = "ACCEPT"; } { v4 = false; precedence = 1000; predicate = "-s 42:1::/32"; target = "ACCEPT"; } ]; krebs.iptables.tables.filter.FORWARD.rules = [ - { precedence = 1000; predicate = "-i wirelum -o retiolum"; target = "ACCEPT"; } - { precedence = 1000; predicate = "-i retiolum -o wirelum"; target = "ACCEPT"; } + { precedence = 1000; predicate = "-i wiregrill -o retiolum"; target = "ACCEPT"; } + { precedence = 1000; predicate = "-i retiolum -o wiregrill"; target = "ACCEPT"; } ]; krebs.iptables.tables.nat.POSTROUTING.rules = [ { v4 = false; predicate = "-s 42:1:ce16::/48 ! -d 42:1:ce16::48"; target = "MASQUERADE"; } diff --git a/lass/1systems/skynet/config.nix b/lass/1systems/skynet/config.nix index 13a8b3e41..4b806af7b 100644 --- a/lass/1systems/skynet/config.nix +++ b/lass/1systems/skynet/config.nix @@ -5,7 +5,6 @@ with import <stockholm/lib>; <stockholm/lass> <stockholm/lass/2configs/retiolum.nix> - <stockholm/lass/2configs/fetchWallpaper.nix> <stockholm/lass/2configs/blue-host.nix> <stockholm/lass/2configs/power-action.nix> { |