diff options
author | makefu <github@syntax-fehler.de> | 2015-11-14 01:50:39 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-11-14 01:50:39 +0100 |
commit | a0fbe917ac45cda4de0f16bced3ce3ebfc556fe8 (patch) | |
tree | 44b66f4c43eeec674dcd763eb50141dd567c35e7 /tv/1systems/cd.nix | |
parent | 79b890670100d08c3640fffade2caf3eced192d8 (diff) | |
parent | ebba531273715c1a9c124007b97f3547d16e780f (diff) |
Merge remote-tracking branch 'cd/master' into pre-merge
Diffstat (limited to 'tv/1systems/cd.nix')
-rw-r--r-- | tv/1systems/cd.nix | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 126c6feb5..8c2a9ae43 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -4,23 +4,8 @@ with lib; { krebs.build.host = config.krebs.hosts.cd; - krebs.build.user = config.krebs.users.tv; - krebs.build.target = "root@cd.internet"; - krebs.build.source = { - git.nixpkgs = { - url = https://github.com/NixOS/nixpkgs; - rev = "c44a593aa43bba6a0708f6f36065a514a5110613"; - }; - dir.secrets = { - path = "/home/tv/secrets/cd"; - }; - dir.stockholm = { - path = "/home/tv/stockholm"; - }; - }; - imports = [ ../2configs/hw/CAC-Developer-2.nix ../2configs/fs/CAC-CentOS-7-64bit.nix @@ -115,7 +100,6 @@ with lib; iftop iotop iptables - mutt # for mv nethogs ntp # ntpate rxvt_unicode.terminfo @@ -126,17 +110,4 @@ with lib; SystemMaxUse=1G RuntimeMaxUse=128M ''; - - users.extraUsers = { - mv = { - uid = 1338; - group = "users"; - home = "/home/mv"; - createHome = true; - useDefaultShell = true; - openssh.authorizedKeys.keys = [ - config.krebs.users.mv.pubkey - ]; - }; - }; } |