diff options
| author | makefu <github@syntax-fehler.de> | 2017-02-12 20:25:06 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-02-12 20:25:06 +0100 |
| commit | a3e7e4f2baa1cc8d8180c50fd530ff0ea2cc0086 (patch) | |
| tree | 5df0db580dd6f108f84ef52777d8fc2d5059c47c /krebs | |
| parent | 444c3ee42485b97184ad8b457474b61326d6a013 (diff) | |
k 3 {m,l}: mv paste.krebsco.de
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/lass/default.nix | 10 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 0b67abd11..6ab8ede56 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -73,13 +73,21 @@ with import <stockholm/lib>; ssh.privkey.path = <secrets/ssh.id_ed25519>; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL21QDOEFdODFh6WAfNp6odrXo15pEsDQuGJfMu/cKzK"; }; - prism = { + prism = rec { cores = 4; + extraZones = { + "krebsco.de" = '' + prism IN A ${nets.internet.ip4.addr} + paste IN A ${nets.internet.ip4.addr} + ''; + }; nets = rec { internet = { ip4.addr = "213.239.205.240"; aliases = [ "prism.internet" + "paste.i" + "paste.internet" ]; ssh.port = 45621; }; diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 650f7b7a2..489f62b65 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -290,7 +290,6 @@ with import <stockholm/lib>; wry IN A ${nets.internet.ip4.addr} io IN NS wry.krebsco.de. graphs IN A ${nets.internet.ip4.addr} - paste 60 IN A ${nets.internet.ip4.addr} tinc IN A ${nets.internet.ip4.addr} ''; }; @@ -299,9 +298,7 @@ with import <stockholm/lib>; ip4.addr = "104.233.87.86"; aliases = [ "wry.i" - "paste.i" "wry.internet" - "paste.internet" ]; }; retiolum = { |