From 03e03a7cbda232d1e8581231aefe632072665194 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 27 Jul 2015 04:33:37 +0200 Subject: 0 tv * -> tv systems * --- 0make/tv/cd.makefile | 4 ---- 0make/tv/mkdir.makefile | 4 ---- 0make/tv/nomic.makefile | 4 ---- 0make/tv/rmdir.makefile | 4 ---- 0make/tv/wu.makefile | 4 ---- tv/systems/cd.nix | 16 ++++++++++++++++ tv/systems/mkdir.nix | 16 ++++++++++++++++ tv/systems/nomic.nix | 16 ++++++++++++++++ tv/systems/rmdir.nix | 16 ++++++++++++++++ tv/systems/wu.nix | 16 ++++++++++++++++ 10 files changed, 80 insertions(+), 20 deletions(-) delete mode 100644 0make/tv/cd.makefile delete mode 100644 0make/tv/mkdir.makefile delete mode 100644 0make/tv/nomic.makefile delete mode 100644 0make/tv/rmdir.makefile delete mode 100644 0make/tv/wu.makefile diff --git a/0make/tv/cd.makefile b/0make/tv/cd.makefile deleted file mode 100644 index e021423f..00000000 --- a/0make/tv/cd.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@cd-global -nixpkgs_url := https://github.com/NixOS/nixpkgs -nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870 -secrets_dir := /home/tv/secrets/cd diff --git a/0make/tv/mkdir.makefile b/0make/tv/mkdir.makefile deleted file mode 100644 index 1e8bf7df..00000000 --- a/0make/tv/mkdir.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@mkdir -nixpkgs_url := https://github.com/NixOS/nixpkgs -nixpkgs_rev := 9d5508d85c33b8fb22d79dde6176792eac2c2696 -secrets_dir := /home/tv/secrets/mkdir diff --git a/0make/tv/nomic.makefile b/0make/tv/nomic.makefile deleted file mode 100644 index 9e0b8671..00000000 --- a/0make/tv/nomic.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@nomic.gg23 -nixpkgs_url := https://github.com/NixOS/nixpkgs -nixpkgs_rev := 9d5508d85c33b8fb22d79dde6176792eac2c2696 -secrets_dir := /home/tv/secrets/nomic diff --git a/0make/tv/rmdir.makefile b/0make/tv/rmdir.makefile deleted file mode 100644 index 6075bd3d..00000000 --- a/0make/tv/rmdir.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@rmdir -nixpkgs_url := https://github.com/NixOS/nixpkgs -nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870 -secrets_dir := /home/tv/secrets/rmdir diff --git a/0make/tv/wu.makefile b/0make/tv/wu.makefile deleted file mode 100644 index 7614af77..00000000 --- a/0make/tv/wu.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@wu -nixpkgs_url := /home/tv/src/nixpkgs -nixpkgs_rev := 9d5508d85c33b8fb22d79dde6176792eac2c2696 -secrets_dir := /home/tv/secrets/wu diff --git a/tv/systems/cd.nix b/tv/systems/cd.nix index 461fbc71..037248c4 100644 --- a/tv/systems/cd.nix +++ b/tv/systems/cd.nix @@ -8,6 +8,22 @@ in { krebs.build.host = config.krebs.hosts.cd; + krebs.build.user = config.krebs.users.tv; + + krebs.build.target = "root@cd.internet"; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + }; + secrets = { + url = "/home/tv/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; imports = [ ../configs/CAC-Developer-2.nix diff --git a/tv/systems/mkdir.nix b/tv/systems/mkdir.nix index a88e9812..f601ec83 100644 --- a/tv/systems/mkdir.nix +++ b/tv/systems/mkdir.nix @@ -4,6 +4,22 @@ with lib; { krebs.build.host = config.krebs.hosts.mkdir; + krebs.build.user = config.krebs.users.tv; + + krebs.build.target = "root@mkdir.internet"; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; + }; + secrets = { + url = "/home/tv/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; imports = [ ../configs/CAC-Developer-1.nix diff --git a/tv/systems/nomic.nix b/tv/systems/nomic.nix index 02bdafc1..c96fe381 100644 --- a/tv/systems/nomic.nix +++ b/tv/systems/nomic.nix @@ -4,6 +4,22 @@ with lib; { krebs.build.host = config.krebs.hosts.nomic; + krebs.build.user = config.krebs.users.tv; + + krebs.build.target = "root@nomic.gg23"; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; + }; + secrets = { + url = "/home/tv/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; imports = [ ../configs/AO753.nix diff --git a/tv/systems/rmdir.nix b/tv/systems/rmdir.nix index eebe3e67..fa91516d 100644 --- a/tv/systems/rmdir.nix +++ b/tv/systems/rmdir.nix @@ -4,6 +4,22 @@ with lib; { krebs.build.host = config.krebs.hosts.rmdir; + krebs.build.user = config.krebs.users.tv; + + krebs.build.target = "root@rmdir.internet"; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + }; + secrets = { + url = "/home/tv/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; imports = [ ../configs/CAC-Developer-1.nix diff --git a/tv/systems/wu.nix b/tv/systems/wu.nix index f0835db7..7c52d948 100644 --- a/tv/systems/wu.nix +++ b/tv/systems/wu.nix @@ -8,6 +8,22 @@ in { krebs.build.host = config.krebs.hosts.wu; + krebs.build.user = config.krebs.users.tv; + + krebs.build.target = "root@wu"; + + krebs.build.deps = { + nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "9d5508d85c33b8fb22d79dde6176792eac2c2696"; + }; + secrets = { + url = "/home/tv/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; imports = [ ../configs/w110er.nix -- cgit v1.2.3