diff options
| author | tv <tv@krebsco.de> | 2016-04-08 03:53:34 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-04-08 03:53:34 +0200 |
| commit | 46e818ebbc5446b4215ad9524089d9b2dc91cbd3 (patch) | |
| tree | 13d7021f55991559d17f3eb51e7ffb8957d093e5 /tv/1systems | |
| parent | 827f1790803bda906ed71c56138cfdbf108ee730 (diff) | |
retiolum: don't hardcode routing prefixes
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/doppelbock.nix | 4 | ||||
| -rw-r--r-- | tv/1systems/mkdir.nix | 11 | ||||
| -rw-r--r-- | tv/1systems/rmdir.nix | 7 |
3 files changed, 4 insertions, 18 deletions
diff --git a/tv/1systems/doppelbock.nix b/tv/1systems/doppelbock.nix index 9a8d5b05d..ec85a7772 100644 --- a/tv/1systems/doppelbock.nix +++ b/tv/1systems/doppelbock.nix @@ -13,8 +13,8 @@ with config.krebs.lib; networking = { interfaces.enp2s1.ip4 = singleton { address = let - addr4 = "45.62.237.203"; - in assert config.krebs.build.host.nets.internet.addrs4 == [addr4]; addr4; + addr = "45.62.237.203"; + in assert config.krebs.build.host.nets.internet.ip4.addr == addr; addr; prefixLength = 24; }; defaultGateway = "45.62.237.1"; diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix index 58a8fdcb2..f46ed9547 100644 --- a/tv/1systems/mkdir.nix +++ b/tv/1systems/mkdir.nix @@ -7,12 +7,7 @@ let getDefaultGateway = ip: concatStringsSep "." (take 3 (splitString "." ip) ++ ["1"]); - - primary-addr4 = - builtins.elemAt config.krebs.build.host.nets.internet.addrs4 0; - - #secondary-addr4 = - # builtins.elemAt config.krebs.build.host.nets.internet.addrs4 1; + primary-addr4 = config.krebs.build.host.nets.internet.ip4.addr; in { @@ -55,10 +50,6 @@ in address = primary-addr4; prefixLength = 24; } - #{ - # address = secondary-addr4; - # prefixLength = 24; - #} ]; # TODO define gateway in krebs/3modules/default.nix diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix index c54caa649..25fae2c36 100644 --- a/tv/1systems/rmdir.nix +++ b/tv/1systems/rmdir.nix @@ -7,12 +7,7 @@ let getDefaultGateway = ip: concatStringsSep "." (take 3 (splitString "." ip) ++ ["1"]); - - primary-addr4 = - builtins.elemAt config.krebs.build.host.nets.internet.addrs4 0; - - #secondary-addr4 = - # builtins.elemAt config.krebs.build.host.nets.internet.addrs4 1; + primary-addr4 = config.krebs.build.host.nets.internet.ip4.addr; in { |