diff options
| author | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-04 22:28:27 +0200 |
| commit | 04c0f3935b257ab3cd396a5274f691e982c8dba3 (patch) | |
| tree | 6dc76859ba10e4a231b34d14b0ed39cb23585073 /krebs | |
| parent | 41df3589f6f3aab31443a486a9d7e82f4e9ff559 (diff) | |
| parent | b5977c92b3c3daa8023f4df1070a240617125019 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/lass/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 0065f7692..aa071270c 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -9,7 +9,7 @@ with import ../../4lib { inherit lib; }; dc = "lass"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["162.248.162.105"]; + addrs4 = ["167.88.34.158"]; aliases = [ "echelon.internet" ]; diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 9311be59d..b958514cc 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -169,6 +169,7 @@ with import ../../4lib { inherit lib; }; extraZones = { "krebsco.de" = '' wry IN A ${head nets.internet.addrs4} + graphs IN A ${head nets.internet.addrs4} ''; }; nets = rec { @@ -183,6 +184,7 @@ with import ../../4lib { inherit lib; }; addrs4 = ["10.243.29.169"]; addrs6 = ["42:6e1e:cc8a:7cef:827:f938:8c64:baad"]; aliases = [ + "graphs.wry.retiolum" "wry.retiolum" ]; tinc.pubkey = '' |