diff options
| author | lassulus <lass@aidsballs.de> | 2015-11-21 14:25:02 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-11-21 14:25:02 +0100 |
| commit | f531e7e62573d59b3a92cbac1bc224ec1ab5f3cc (patch) | |
| tree | 49582b817265fd7b6dfc8a524a84af7ed12ba28f /krebs/3modules/shared | |
| parent | a0202683177b022e3f2b67cd5929baccb868a26e (diff) | |
| parent | a8d007868342517c235963a8ab13cff7c0e5d59e (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs/3modules/shared')
| -rw-r--r-- | krebs/3modules/shared/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix index 13aae886b..b332676c6 100644 --- a/krebs/3modules/shared/default.nix +++ b/krebs/3modules/shared/default.nix @@ -33,12 +33,17 @@ let in { hosts = addNames { wolf = { - #dc = "shack"; + dc = "shack"; nets = { - #shack = { - # addrs4 = [ TODO ]; - # aliases = ["wolf.shack"]; - #}; + shack = { + addrs4 = [ "10.42.2.150" ]; + aliases = [ + "wolf.shack" + "graphite.shack" + "acng.shack" + "drivedroid.shack" + ]; + }; retiolum = { addrs4 = ["10.243.77.1"]; addrs6 = ["42:0:0:0:0:0:77:1"]; |