Merge branch 'master' of ssh.git.shackspace.de:rz/stockholm

This commit is contained in:
makefu 2019-07-17 10:43:58 +02:00
commit 6822bf0ecf
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -1,7 +1,6 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
shack-ip = config.krebs.build.host.nets.shack.ip4.addr; shack-ip = config.krebs.build.host.nets.shack.ip4.addr;
openhab-ip = "10.42.2.139"; # powerraw contains the hardcoded ip of openhab.shack
influx-host = "127.0.0.1"; influx-host = "127.0.0.1";
ext-if = "et0"; ext-if = "et0";
external-mac = "52:54:b0:0b:af:fe"; external-mac = "52:54:b0:0b:af:fe";
@ -99,10 +98,6 @@ in
address = shack-ip; address = shack-ip;
prefixLength = 20; prefixLength = 20;
} }
{
address = openhab-ip;
prefixLength = 20;
}
]; ];
defaultGateway = "10.42.0.1"; defaultGateway = "10.42.0.1";