diff options
| author | makefu <github@syntax-fehler.de> | 2015-11-06 22:23:46 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-11-06 22:23:46 +0100 |
| commit | 736e1426d5a7ec76d0987840552d56c6b4f0248e (patch) | |
| tree | 944c5595dfbb2c66dfe934d48cc8349522c91aa8 /krebs/3modules | |
| parent | 2dcb2918d1cd159d9282096ef3b5cecc4239bfbc (diff) | |
| parent | 12597b1febb0bc47cf98529a12e5fc6af1d8f5a4 (diff) | |
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 5 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index a9279b02..652527da 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -164,6 +164,7 @@ with lib; dc = "makefu"; #dc = "cac"; extraZones = { "krebsco.de" = '' + euer IN A ${head nets.internet.addrs4} wiki.euer IN A ${head nets.internet.addrs4} wry IN A ${head nets.internet.addrs4} io IN NS wry.krebsco.de. @@ -191,6 +192,9 @@ with lib; "paste.retiolum" "wry.retiolum" "wiki.makefu.retiolum" + "wiki.wry.retiolum" + "blog.makefu.retiolum" + "blog.wry.retiolum" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- @@ -240,7 +244,6 @@ with lib; extraZones = { "krebsco.de" = '' - euer IN A ${head nets.internet.addrs4} share.euer IN A ${head nets.internet.addrs4} gum IN A ${head nets.internet.addrs4} ''; diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 4c295dff..302d1a92 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -158,7 +158,8 @@ with lib; }; }; secure = true; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILn7C3LxAs9kUynENdRNgQs4qjrhNDfXzlHTpVJt6e09"; + ssh.privkey.path = <secrets/ssh.id_ed25519>; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMPMh3nHxVcPqM+LrkK7eYxNJY1ShBXOTg1vlSR45wx"; }; ok = { nets = { |