diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-04 10:16:09 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-04 10:16:09 +0100 |
| commit | 65cc52e01e18c823016a3043b8cf41822934cc3c (patch) | |
| tree | 58aa8971a4e571234a762eee20c7ec7f57a2b4d4 /krebs/3modules | |
| parent | 597f9e8597c95ac9e4cba1689322c433bb0c9a75 (diff) | |
| parent | b5ffb88ba3a77d4f399d7a2815e2c61d53545f5d (diff) | |
Merge branch 'master' of pnp:stockholm
Conflicts:
makefu/1systems/gum.nix
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/lass/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/mv/default.nix | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index c99263fe..26b0947b 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -9,7 +9,7 @@ with lib; dc = "lass"; #dc = "cac"; nets = rec { internet = { - addrs4 = ["167.88.34.158"]; + addrs4 = ["162.252.241.33"]; aliases = [ "echelon.internet" ]; diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 652527da..037abbdf 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -245,6 +245,8 @@ with lib; extraZones = { "krebsco.de" = '' share.euer IN A ${head nets.internet.addrs4} + mattermost.euer IN A ${head nets.internet.addrs4} + git.euer IN A ${head nets.internet.addrs4} gum IN A ${head nets.internet.addrs4} ''; }; diff --git a/krebs/3modules/mv/default.nix b/krebs/3modules/mv/default.nix index 446caf45..6da2abc8 100644 --- a/krebs/3modules/mv/default.nix +++ b/krebs/3modules/mv/default.nix @@ -13,6 +13,7 @@ with lib; addrs6 = ["42:0:0:0:0:0:111:111"]; aliases = [ "stro.retiolum" + "cgit.stro.retiolum" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- |