From 6a0dc8e6d766fe4e970e7b360fbb2bbe79421853 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/cd.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index d3cae6f..407fc25 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -57,19 +57,19 @@ in { imports = [ ../../3modules/tv/iptables.nix - ../../3modules/tv/nginx.nix + ../../3modules/krebs/nginx.nix ]; tv.iptables.input-internet-accept-new-tcp = singleton "http"; - tv.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de"; + krebs.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de"; } { # TODO make public_html also available to cd, cd.retiolum (AKA default) imports = [ ../../3modules/tv/iptables.nix - ../../3modules/tv/nginx.nix + ../../3modules/krebs/nginx.nix ]; tv.iptables.input-internet-accept-new-tcp = singleton "http"; - tv.nginx.servers.public_html = { + krebs.nginx.servers.public_html = { server-names = singleton "cd.viljetic.de"; locations = singleton (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' alias /home/$1/public_html$2; @@ -77,7 +77,7 @@ in }; } { - tv.nginx.servers.viljetic = { + krebs.nginx.servers.viljetic = { server-names = singleton "viljetic.de"; # TODO directly set root (instead via location) locations = singleton (nameValuePair "/" '' -- cgit v1.2.3 From 4e846ab7b38bc6c5ecf8213a027cc8ec4fa819d8 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 12:03:51 +0200 Subject: 3: {tv -> krebs}.github-hosts-sync --- 1systems/tv/cd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index 407fc25..463d643 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -29,10 +29,10 @@ in }; } { - imports = [ ../../3modules/tv/github-hosts-sync.nix ]; - tv.github-hosts-sync.enable = true; + imports = [ ../../3modules/krebs/github-hosts-sync.nix ]; + krebs.github-hosts-sync.enable = true; tv.iptables.input-internet-accept-new-tcp = - singleton config.tv.github-hosts-sync.port; + singleton config.krebs.github-hosts-sync.port; } { imports = [ ../../2configs/tv/identity.nix ]; -- cgit v1.2.3 From 873e1f90025f7eb1b13607130dbc4164cc2a0c44 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/cd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index 463d643..2f8cf81 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -86,8 +86,8 @@ in }; } { - imports = [ ../../3modules/tv/retiolum.nix ]; - tv.retiolum = { + imports = [ ../../3modules/krebs/retiolum.nix ]; + krebs.retiolum = { enable = true; hosts = ../../Zhosts; connectTo = [ -- cgit v1.2.3 From 1fa2d83e3cdd3305fde7751d0c3ae64d5f8fed48 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/cd.nix | 1 - 1 file changed, 1 deletion(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index 2f8cf81..bf556e0 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -89,7 +89,6 @@ in imports = [ ../../3modules/krebs/retiolum.nix ]; krebs.retiolum = { enable = true; - hosts = ../../Zhosts; connectTo = [ "fastpoke" "pigstarter" -- cgit v1.2.3 From 4165440f467e2c573ba248ae9cdcae54d1488bc5 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/cd.nix | 12 ------------ 1 file changed, 12 deletions(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index bf556e0..b15b189 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -22,14 +22,12 @@ in }; } { - imports = [ ../../3modules/tv/ejabberd.nix ]; tv.ejabberd = { enable = true; hosts = [ "jabber.viljetic.de" ]; }; } { - imports = [ ../../3modules/krebs/github-hosts-sync.nix ]; krebs.github-hosts-sync.enable = true; tv.iptables.input-internet-accept-new-tcp = singleton config.krebs.github-hosts-sync.port; @@ -39,7 +37,6 @@ in tv.identity.self = config.tv.identity.hosts.cd; } { - imports = [ ../../3modules/tv/iptables.nix ]; tv.iptables = { enable = true; input-internet-accept-new-tcp = [ @@ -55,19 +52,11 @@ in }; } { - imports = [ - ../../3modules/tv/iptables.nix - ../../3modules/krebs/nginx.nix - ]; tv.iptables.input-internet-accept-new-tcp = singleton "http"; krebs.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de"; } { # TODO make public_html also available to cd, cd.retiolum (AKA default) - imports = [ - ../../3modules/tv/iptables.nix - ../../3modules/krebs/nginx.nix - ]; tv.iptables.input-internet-accept-new-tcp = singleton "http"; krebs.nginx.servers.public_html = { server-names = singleton "cd.viljetic.de"; @@ -86,7 +75,6 @@ in }; } { - imports = [ ../../3modules/krebs/retiolum.nix ]; krebs.retiolum = { enable = true; connectTo = [ -- cgit v1.2.3 From e1d542e07d5ee9c26a04f273b0eb6ff8adccf756 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/cd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index b15b189..d30e7ed 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -13,7 +13,7 @@ in ../../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/charybdis.nix ]; tv.charybdis = { -- cgit v1.2.3 From c9b3c530a6902979feaba0b07e3b6542708a72f5 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/cd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index d30e7ed..c0c41e9 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -34,7 +34,7 @@ in } { imports = [ ../../2configs/tv/identity.nix ]; - tv.identity.self = config.tv.identity.hosts.cd; + tv.identity.self = config.krebs.hosts.cd; } { tv.iptables = { -- cgit v1.2.3 From 129829cacfee9bc5b7fda99e50b70bc3ffe8a9bc 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/cd.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index c0c41e9..4b8c40f 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -7,6 +7,8 @@ let in { + krebs.build.host = config.krebs.hosts.cd; + imports = [ ../../2configs/tv/CAC-Developer-2.nix ../../2configs/tv/CAC-CentOS-7-64bit.nix @@ -32,10 +34,6 @@ in tv.iptables.input-internet-accept-new-tcp = singleton config.krebs.github-hosts-sync.port; } - { - imports = [ ../../2configs/tv/identity.nix ]; - tv.identity.self = config.krebs.hosts.cd; - } { tv.iptables = { enable = true; -- cgit v1.2.3 From 5ef409768b25185d7fef7f1fb9096d89ff16c6e4 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 25 Jul 2015 00:44:51 +0200 Subject: tv: source pubkeys from registry --- 1systems/tv/cd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index 4b8c40f..fcaf19c 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -120,8 +120,8 @@ in home = "/home/mv"; createHome = true; useDefaultShell = true; - openssh.authorizedKeys.keys = map readFile [ - ../../Zpubkeys/mv_vod.ssh.pub + openssh.authorizedKeys.keys = [ + config.krebs.users.mv.pubkey ]; }; }; -- cgit v1.2.3 From dd23ad961ecbaff5ac51bfde6a5bcd374edee26b 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/cd.nix | 1 - 1 file changed, 1 deletion(-) (limited to '1systems/tv/cd.nix') diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index fcaf19c..6913508 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -84,7 +84,6 @@ in } ]; - networking.hostName = "cd"; networking.interfaces.enp2s1.ip4 = [ { address = "162.219.7.216"; -- cgit v1.2.3