From 734ec4ae00c93d48297b7c3ee226ef890187bfa3 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 11:50:23 +0200 Subject: 3 {tv -> krebs}.nginx --- 1systems/tv/nomic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index 6f984c44..8e6812e4 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -26,8 +26,8 @@ with lib; }; } { - imports = [ ../../3modules/tv/nginx.nix ]; - tv.nginx = { + imports = [ ../../3modules/krebs/nginx.nix ]; + krebs.nginx = { enable = true; servers.default.locations = [ (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' -- cgit v1.2.3 From e082da2c23ebff82717df11d266ecfd22a70db56 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 12:34:25 +0200 Subject: 3 tv retiolum: RIP --- 1systems/tv/nomic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index 8e6812e4..bae12d36 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -37,8 +37,8 @@ with lib; }; } { - imports = [ ../../3modules/tv/retiolum.nix ]; - tv.retiolum = { + imports = [ ../../3modules/krebs/retiolum.nix ]; + krebs.retiolum = { enable = true; hosts = ../../Zhosts; connectTo = [ -- cgit v1.2.3 From faf5f6c172d6a6915e18cdec85e3543051eb0449 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 12:41:41 +0200 Subject: krebs.retiolum: define type of hosts --- 1systems/tv/nomic.nix | 1 - 1 file changed, 1 deletion(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index bae12d36..ef4a5ca3 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -40,7 +40,6 @@ with lib; imports = [ ../../3modules/krebs/retiolum.nix ]; krebs.retiolum = { enable = true; - hosts = ../../Zhosts; connectTo = [ "gum" "pigstarter" -- cgit v1.2.3 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)} --- 1systems/tv/nomic.nix | 3 --- 1 file changed, 3 deletions(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index ef4a5ca3..367502ee 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -14,7 +14,6 @@ with lib; tv.identity.self = config.tv.identity.hosts.nomic; } { - imports = [ ../../3modules/tv/iptables.nix ]; tv.iptables = { enable = true; input-internet-accept-new-tcp = [ @@ -26,7 +25,6 @@ with lib; }; } { - imports = [ ../../3modules/krebs/nginx.nix ]; krebs.nginx = { enable = true; servers.default.locations = [ @@ -37,7 +35,6 @@ with lib; }; } { - imports = [ ../../3modules/krebs/retiolum.nix ]; krebs.retiolum = { enable = true; connectTo = [ -- cgit v1.2.3 From 54becaa19fcbc11ac709ddaf86e56ee3b736931d Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 19:33:20 +0200 Subject: tv git: add restricted repos --- 1systems/tv/nomic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index 367502ee..2d32d9e1 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -8,7 +8,7 @@ with lib; ../../2configs/tv/base.nix ../../2configs/tv/consul-server.nix ../../2configs/tv/exim-retiolum.nix - ../../2configs/tv/git-public.nix + ../../2configs/tv/git.nix { imports = [ ../../2configs/tv/identity.nix ]; tv.identity.self = config.tv.identity.hosts.nomic; -- 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 --- 1systems/tv/nomic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index 2d32d9e1..fc58c169 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -11,7 +11,7 @@ with lib; ../../2configs/tv/git.nix { imports = [ ../../2configs/tv/identity.nix ]; - tv.identity.self = config.tv.identity.hosts.nomic; + tv.identity.self = config.krebs.hosts.nomic; } { tv.iptables = { -- 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 --- 1systems/tv/nomic.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index fc58c169..1f7f6b18 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -3,16 +3,14 @@ with lib; { + krebs.build.host = config.krebs.hosts.nomic; + imports = [ ../../2configs/tv/AO753.nix ../../2configs/tv/base.nix ../../2configs/tv/consul-server.nix ../../2configs/tv/exim-retiolum.nix ../../2configs/tv/git.nix - { - imports = [ ../../2configs/tv/identity.nix ]; - tv.identity.self = config.krebs.hosts.nomic; - } { tv.iptables = { enable = true; -- cgit v1.2.3 From 8d7c80aac644558768a689012d7b31d23f559d66 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 25 Jul 2015 01:38:26 +0200 Subject: {1 tv * -> 2 tv base} networking.hostName --- 1systems/tv/nomic.nix | 2 -- 1 file changed, 2 deletions(-) (limited to '1systems/tv/nomic.nix') diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix index 1f7f6b18..cd6e0259 100644 --- a/1systems/tv/nomic.nix +++ b/1systems/tv/nomic.nix @@ -97,6 +97,4 @@ with lib; rxvt_unicode.terminfo tmux ]; - - networking.hostName = "nomic"; } -- cgit v1.2.3