summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/shared
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-11 21:31:15 +0100
committermakefu <github@syntax-fehler.de>2016-02-11 21:31:15 +0100
commit014cbb7598c5d45cfc4cc7e1ec81c92e000eabfb (patch)
treefab0e894948010cd73be18ad2c68cd4750bd2419 /krebs/3modules/shared
parent8ecdb889dd3081ba29c6ea7eb35f60b30420d201 (diff)
parent7b3b839cc7a2af73dee9858e6ebcc7be831eb481 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/shared')
-rw-r--r--krebs/3modules/shared/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix
index 91d92857b..df4c529bf 100644
--- a/krebs/3modules/shared/default.nix
+++ b/krebs/3modules/shared/default.nix
@@ -32,9 +32,8 @@ let
};
});
in {
- hosts = addNames {
+ hosts = {
wolf = {
- dc = "shack";
nets = {
shack = {
addrs4 = [ "10.42.2.150" ];
@@ -68,7 +67,7 @@ in {
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYMXMWZIK0jjnZDM9INiYAKcwjXs2241vew54K8veCR";
};
} // testHosts;
- users = addNames {
+ users = {
shared = {
mail = "spam@krebsco.de";
pubkey = "lol"; # TODO krebs.users.shared.pubkey should be unnecessary