Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv: condense krebs.build

Browse Source
This commit is contained in:
tv 2015-11-06 22:36:01 +01:00
parent 4d93a8215f
commit bae469d2a6
6 changed files with 19 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tv/1systems/mkdir.nix
View File

@ -17,23 +17,9 @@ in
{ {
krebs.build.host = config.krebs.hosts.mkdir; krebs.build.host = config.krebs.hosts.mkdir;
krebs.build.user = config.krebs.users.tv;
krebs.build.target = "root@${primary-addr4}"; krebs.build.target = "root@${primary-addr4}";
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
path = "/home/tv/secrets/mkdir";
};
dir.stockholm = {
path = "/home/tv/stockholm";
};
};
imports = [ imports = [
../2configs/hw/CAC-Developer-1.nix ../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/fs/CAC-CentOS-7-64bit.nix

14
tv/1systems/nomic.nix
View File

@ -4,23 +4,9 @@ with lib;
{ {
krebs.build.host = config.krebs.hosts.nomic; krebs.build.host = config.krebs.hosts.nomic;
krebs.build.user = config.krebs.users.tv;
krebs.build.target = "root@nomic.gg23"; krebs.build.target = "root@nomic.gg23";
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
path = "/home/tv/secrets/nomic";
};
dir.stockholm = {
path = "/home/tv/stockholm";
};
};
imports = [ imports = [
../2configs/hw/AO753.nix ../2configs/hw/AO753.nix
#../2configs/consul-server.nix #../2configs/consul-server.nix

14
tv/1systems/rmdir.nix
View File

@ -17,23 +17,9 @@ in
{ {
krebs.build.host = config.krebs.hosts.rmdir; krebs.build.host = config.krebs.hosts.rmdir;
krebs.build.user = config.krebs.users.tv;
krebs.build.target = "root@rmdir.internet"; krebs.build.target = "root@rmdir.internet";
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
path = "/home/tv/secrets/rmdir";
};
dir.stockholm = {
path = "/home/tv/stockholm";
};
};
imports = [ imports = [
../2configs/hw/CAC-Developer-1.nix ../2configs/hw/CAC-Developer-1.nix
../2configs/fs/CAC-CentOS-7-64bit.nix ../2configs/fs/CAC-CentOS-7-64bit.nix

18
tv/1systems/wu.nix
View File

@ -4,24 +4,6 @@ with lib;
{ {
krebs.build.host = config.krebs.hosts.wu; krebs.build.host = config.krebs.hosts.wu;
krebs.build.user = config.krebs.users.tv;
krebs.build.target = "root@wu";
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
target-path = "/var/src/nixpkgs";
};
dir.secrets = {
path = "/home/tv/secrets/wu";
};
dir.stockholm = {
path = "/home/tv/stockholm";
target-path = "/var/src/stockholm";
};
};
imports = [ imports = [
../2configs/hw/w110er.nix ../2configs/hw/w110er.nix

16
tv/1systems/xu.nix
View File

@ -4,22 +4,6 @@ with lib;
{ {
krebs.build.host = config.krebs.hosts.xu; krebs.build.host = config.krebs.hosts.xu;
krebs.build.user = config.krebs.users.tv;
krebs.build.target = "root@xu";
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
path = "/home/tv/secrets/xu";
};
dir.stockholm = {
path = "/home/tv/stockholm";
};
};
imports = [ imports = [
../2configs/hw/x220.nix ../2configs/hw/x220.nix

19
tv/2configs/default.nix
View File

@ -5,6 +5,25 @@ with lib;
{ {
krebs.enable = true; krebs.enable = true;
krebs.build = {
user = config.krebs.users.tv;
target = mkDefault "root@${config.krebs.build.host.name}";
source = {
git.nixpkgs = {
url = mkDefault https://github.com/NixOS/nixpkgs;
rev = mkDefault "c44a593aa43bba6a0708f6f36065a514a5110613";
target-path = mkDefault "/var/src/nixpkgs";
};
dir.secrets = {
path = mkDefault "/home/tv/secrets/${config.krebs.build.host.name}";
};
dir.stockholm = {
path = mkDefault "/home/tv/stockholm";
target-path = mkDefault "/var/src/stockholm";
};
};
};
networking.hostName = config.krebs.build.host.name; networking.hostName = config.krebs.build.host.name;
imports = [ imports = [