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/rmdir.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index b77a1c39..2cf9668c 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -29,8 +29,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/rmdir.nix | 1 - 1 file changed, 1 deletion(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index 2cf9668c..f15c7902 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -32,7 +32,6 @@ with lib; imports = [ ../../3modules/krebs/retiolum.nix ]; krebs.retiolum = { enable = true; - hosts = ../../Zhosts; connectTo = [ "cd" "mkdir" -- 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/rmdir.nix | 2 -- 1 file changed, 2 deletions(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index f15c7902..497354e6 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -15,7 +15,6 @@ with lib; tv.identity.self = config.tv.identity.hosts.rmdir; } { - imports = [ ../../3modules/tv/iptables.nix ]; tv.iptables = { enable = true; input-internet-accept-new-tcp = [ @@ -29,7 +28,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/rmdir.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index 497354e6..c470086c 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -9,7 +9,7 @@ with lib; ../../2configs/tv/base.nix ../../2configs/tv/consul-server.nix ../../2configs/tv/exim-smarthost.nix - ../../2configs/tv/git-public.nix + ../../2configs/tv/git.nix { imports = [ ../../2configs/tv/identity.nix ]; tv.identity.self = config.tv.identity.hosts.rmdir; -- 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/rmdir.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index c470086c..15d624d1 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -12,7 +12,7 @@ with lib; ../../2configs/tv/git.nix { imports = [ ../../2configs/tv/identity.nix ]; - tv.identity.self = config.tv.identity.hosts.rmdir; + tv.identity.self = config.krebs.hosts.rmdir; } { 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/rmdir.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index 15d624d1..45e9997e 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -3,6 +3,8 @@ with lib; { + krebs.build.host = config.krebs.hosts.rmdir; + imports = [ ../../2configs/tv/CAC-Developer-1.nix ../../2configs/tv/CAC-CentOS-7-64bit.nix @@ -10,10 +12,6 @@ with lib; ../../2configs/tv/consul-server.nix ../../2configs/tv/exim-smarthost.nix ../../2configs/tv/git.nix - { - imports = [ ../../2configs/tv/identity.nix ]; - tv.identity.self = config.krebs.hosts.rmdir; - } { 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/rmdir.nix | 1 - 1 file changed, 1 deletion(-) (limited to '1systems/tv/rmdir.nix') diff --git a/1systems/tv/rmdir.nix b/1systems/tv/rmdir.nix index 45e9997e..9233014b 100644 --- a/1systems/tv/rmdir.nix +++ b/1systems/tv/rmdir.nix @@ -39,7 +39,6 @@ with lib; } ]; - networking.hostName = "rmdir"; networking.interfaces.enp2s1.ip4 = [ { address = "167.88.44.94"; -- cgit v1.2.3