diff options
| author | tv <tv@krebsco.de> | 2017-09-05 23:00:23 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-09-05 23:00:23 +0200 |
| commit | 1436781119f92cbf431db5e817fba765b24d922a (patch) | |
| tree | f8ee298cdddd02beab384b047cc1a76bd1bd26c1 /krebs/3modules | |
| parent | 77e9bd83e2208d1d732ef505e0e996a2440d5d7c (diff) | |
| parent | 71d3f53f2bf767cfbb6e941438431d6083f304b9 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/krebs/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 881329a47..2fe3e5115 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -71,6 +71,7 @@ in { ip6.addr = "42:0:0:0:0:0:77:3"; aliases = [ "hotdog.r" + "build.r" "build.hotdog.r" "cgit.hotdog.r" ]; @@ -100,6 +101,7 @@ in { "puyak.r" "build.puyak.r" "cgit.puyak.r" + "go.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 9b1e6ba20..257268af2 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -56,7 +56,6 @@ with import <stockholm/lib>; aliases = [ "echelon.r" "cgit.echelon.r" - "go.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- |