From f1ebbc73395e733e222b7f51e3fb554579ec1916 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 17:34:08 +0200 Subject: autoimport 3*/{krebs,$(LOGNAME)} --- 2configs/tv/consul-server.nix | 1 - 1 file changed, 1 deletion(-) (limited to '2configs/tv/consul-server.nix') diff --git a/2configs/tv/consul-server.nix b/2configs/tv/consul-server.nix index 1c8dcb88..5d3fd557 100644 --- a/2configs/tv/consul-server.nix +++ b/2configs/tv/consul-server.nix @@ -1,7 +1,6 @@ { config, ... }: { - imports = [ ../../3modules/tv/consul.nix ]; tv.consul = rec { enable = true; -- cgit v1.2.3 From 62ad5ff9d2bb41acdad20b68ee47c4a32ce928b6 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 21:15:18 +0200 Subject: { * tv identity -> 3 krebs}.hosts --- 2configs/tv/consul-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '2configs/tv/consul-server.nix') diff --git a/2configs/tv/consul-server.nix b/2configs/tv/consul-server.nix index 5d3fd557..63dabdc2 100644 --- a/2configs/tv/consul-server.nix +++ b/2configs/tv/consul-server.nix @@ -9,7 +9,7 @@ server = true; - hosts = with config.tv.identity.hosts; [ + hosts = with config.krebs.hosts; [ # TODO get this list automatically from each host where tv.consul.enable is true cd mkdir -- cgit v1.2.3 From 6840ea1191dd7fc1ad02ae698875e044265d716b Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 25 Jul 2015 00:04:04 +0200 Subject: tv.identity -> krebs.build + extraHosts hack --- 2configs/tv/consul-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '2configs/tv/consul-server.nix') diff --git a/2configs/tv/consul-server.nix b/2configs/tv/consul-server.nix index 63dabdc2..d10f9ea7 100644 --- a/2configs/tv/consul-server.nix +++ b/2configs/tv/consul-server.nix @@ -4,7 +4,7 @@ tv.consul = rec { enable = true; - inherit (config.tv.identity) self; + self = config.krebs.build.host; inherit (self) dc; server = true; -- cgit v1.2.3