From b61f19e6edc0a583bf4cae45c62d75fce4ac910a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 21:27:19 +0200 Subject: krebs.hosts: populate if enable, not via default --- 2configs/tv/base.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to '2configs/tv/base.nix') diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix index 0494ea08..14d84c9f 100644 --- a/2configs/tv/base.nix +++ b/2configs/tv/base.nix @@ -9,6 +9,8 @@ let in { + krebs.enable = true; + imports = [ { users.extraUsers = -- cgit v1.2.3 From a489c7be84ffa76bb71542277af6c114c40961f2 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 25 Jul 2015 00:44:51 +0200 Subject: tv: source pubkeys from registry --- 2configs/tv/base.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '2configs/tv/base.nix') diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix index 14d84c9f..c7d3e0d2 100644 --- a/2configs/tv/base.nix +++ b/2configs/tv/base.nix @@ -24,8 +24,8 @@ in { users.extraUsers = { root = { - openssh.authorizedKeys.keys = map readFile [ - ../../Zpubkeys/tv_wu.ssh.pub + openssh.authorizedKeys.keys = [ + config.krebs.users.tv.pubkey ]; }; tv = { @@ -39,8 +39,8 @@ in "video" "wheel" ]; - openssh.authorizedKeys.keys = map readFile [ - ../../Zpubkeys/tv_wu.ssh.pub + openssh.authorizedKeys.keys = [ + config.krebs.users.tv.pubkey ]; }; }; -- cgit v1.2.3 From d03dba41d6543adc2c73a7818cd32ca79046c64b Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 25 Jul 2015 01:06:13 +0200 Subject: krebs.users.[mt]v: set mail --- 2configs/tv/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '2configs/tv/base.nix') diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix index c7d3e0d2..ab6d2476 100644 --- a/2configs/tv/base.nix +++ b/2configs/tv/base.nix @@ -47,7 +47,7 @@ in } { security.sudo.extraConfig = '' - Defaults mailto="tv@wu.retiolum" + Defaults mailto="${config.krebs.users.tv.mail}" ''; time.timeZone = "Europe/Berlin"; } -- cgit v1.2.3 From 4df0d6e75b7e34db2fda4c8b782b93d265475272 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 25 Jul 2015 01:14:34 +0200 Subject: tv base: set krebs.search-domain --- 2configs/tv/base.nix | 1 + 1 file changed, 1 insertion(+) (limited to '2configs/tv/base.nix') diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix index ab6d2476..40fe9ee0 100644 --- a/2configs/tv/base.nix +++ b/2configs/tv/base.nix @@ -10,6 +10,7 @@ in { krebs.enable = true; + krebs.search-domain = "retiolum"; imports = [ { -- 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 --- 2configs/tv/base.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to '2configs/tv/base.nix') diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix index 40fe9ee0..06f83ea9 100644 --- a/2configs/tv/base.nix +++ b/2configs/tv/base.nix @@ -12,6 +12,8 @@ in krebs.enable = true; krebs.search-domain = "retiolum"; + networking.hostName = config.krebs.build.host.name; + imports = [ { users.extraUsers = -- cgit v1.2.3