From 58380c82848c3db0bd6c3d74904153f3464c2098 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Jul 2017 00:17:58 +0200 Subject: [PATCH] merge shared into krebs --- Makefile | 2 +- .../test-all-krebs-modules/config.nix | 5 +-- .../test-all-krebs-modules/source.nix | 3 ++ .../1systems/test-arch/config.nix | 3 +- krebs/1systems/test-arch/source.nix | 3 ++ .../1systems/test-centos6/config.nix | 5 +-- krebs/1systems/test-centos6/source.nix | 3 ++ krebs/1systems/test-centos7/config.nix | 17 ++++++++++ krebs/1systems/test-centos7/source.nix | 3 ++ .../1systems/test-failing/config.nix | 3 +- krebs/1systems/test-failing/source.nix | 3 ++ .../1systems/test-minimal-deploy/config.nix | 5 +-- krebs/1systems/test-minimal-deploy/source.nix | 3 ++ {shared => krebs}/1systems/wolf/config.nix | 31 ++++++++++--------- krebs/1systems/wolf/source.nix | 3 ++ .../2configs/central-stats-client.nix | 0 {shared => krebs}/2configs/cgit-mirror.nix | 0 {shared => krebs}/2configs/collectd-base.nix | 0 {shared => krebs}/2configs/default.nix | 3 +- {shared => krebs}/2configs/graphite.nix | 0 .../os-templates/CAC-CentOS-6.5-64bit.nix | 0 .../os-templates/CAC-CentOS-7-64bit.nix | 0 {shared => krebs}/2configs/repo-sync.nix | 0 {shared => krebs}/2configs/save-diskspace.nix | 0 {shared => krebs}/2configs/shack/bincache.nix | 0 .../2configs/shack/drivedroid.nix | 0 {shared => krebs}/2configs/shack/mqtt_sub.nix | 0 .../2configs/shack/muell_caller.nix | 0 .../2configs/shack/nix-cacher.nix | 0 .../2configs/shack/radioactive.nix | 0 {shared => krebs}/2configs/shack/share.nix | 0 .../2configs/shack/worlddomination.nix | 0 .../2configs/shared-buildbot.nix | 10 +++--- {shared => krebs}/2configs/temp/dirs.nix | 0 .../2configs/temp/networking.nix | 0 krebs/3modules/default.nix | 2 +- krebs/3modules/{shared => krebs}/default.nix | 8 ++--- krebs/5pkgs/test/infest-cac-centos7/notes | 8 ++--- .../6tests/data/secrets/grafana_security.nix | 0 .../6tests/data/secrets/retiolum.rsa_key.priv | 0 .../6tests/data/secrets/ssh.id_ed25519 | 0 {shared => krebs}/source.nix | 10 +++--- .../test-all-krebs-modules/source.nix | 3 -- shared/1systems/test-arch/source.nix | 3 -- shared/1systems/test-centos6/source.nix | 3 -- shared/1systems/test-centos7/config.nix | 16 ---------- shared/1systems/test-centos7/source.nix | 3 -- shared/1systems/test-failing/source.nix | 3 -- .../1systems/test-minimal-deploy/source.nix | 3 -- shared/1systems/wolf/source.nix | 3 -- shared/3modules/default.nix | 5 --- shared/default.nix | 8 ----- 52 files changed, 88 insertions(+), 95 deletions(-) rename {shared => krebs}/1systems/test-all-krebs-modules/config.nix (93%) create mode 100644 krebs/1systems/test-all-krebs-modules/source.nix rename {shared => krebs}/1systems/test-arch/config.nix (90%) create mode 100644 krebs/1systems/test-arch/source.nix rename {shared => krebs}/1systems/test-centos6/config.nix (79%) create mode 100644 krebs/1systems/test-centos6/source.nix create mode 100644 krebs/1systems/test-centos7/config.nix create mode 100644 krebs/1systems/test-centos7/source.nix rename {shared => krebs}/1systems/test-failing/config.nix (68%) create mode 100644 krebs/1systems/test-failing/source.nix rename {shared => krebs}/1systems/test-minimal-deploy/config.nix (75%) create mode 100644 krebs/1systems/test-minimal-deploy/source.nix rename {shared => krebs}/1systems/wolf/config.nix (75%) create mode 100644 krebs/1systems/wolf/source.nix rename {shared => krebs}/2configs/central-stats-client.nix (100%) rename {shared => krebs}/2configs/cgit-mirror.nix (100%) rename {shared => krebs}/2configs/collectd-base.nix (100%) rename {shared => krebs}/2configs/default.nix (91%) rename {shared => krebs}/2configs/graphite.nix (100%) rename {shared => krebs}/2configs/os-templates/CAC-CentOS-6.5-64bit.nix (100%) rename {shared => krebs}/2configs/os-templates/CAC-CentOS-7-64bit.nix (100%) rename {shared => krebs}/2configs/repo-sync.nix (100%) rename {shared => krebs}/2configs/save-diskspace.nix (100%) rename {shared => krebs}/2configs/shack/bincache.nix (100%) rename {shared => krebs}/2configs/shack/drivedroid.nix (100%) rename {shared => krebs}/2configs/shack/mqtt_sub.nix (100%) rename {shared => krebs}/2configs/shack/muell_caller.nix (100%) rename {shared => krebs}/2configs/shack/nix-cacher.nix (100%) rename {shared => krebs}/2configs/shack/radioactive.nix (100%) rename {shared => krebs}/2configs/shack/share.nix (100%) rename {shared => krebs}/2configs/shack/worlddomination.nix (100%) rename {shared => krebs}/2configs/shared-buildbot.nix (94%) rename {shared => krebs}/2configs/temp/dirs.nix (100%) rename {shared => krebs}/2configs/temp/networking.nix (100%) rename krebs/3modules/{shared => krebs}/default.nix (92%) rename {shared => krebs}/6tests/data/secrets/grafana_security.nix (100%) rename {shared => krebs}/6tests/data/secrets/retiolum.rsa_key.priv (100%) rename {shared => krebs}/6tests/data/secrets/ssh.id_ed25519 (100%) rename {shared => krebs}/source.nix (58%) delete mode 100644 shared/1systems/test-all-krebs-modules/source.nix delete mode 100644 shared/1systems/test-arch/source.nix delete mode 100644 shared/1systems/test-centos6/source.nix delete mode 100644 shared/1systems/test-centos7/config.nix delete mode 100644 shared/1systems/test-centos7/source.nix delete mode 100644 shared/1systems/test-failing/source.nix delete mode 100644 shared/1systems/test-minimal-deploy/source.nix delete mode 100644 shared/1systems/wolf/source.nix delete mode 100644 shared/3modules/default.nix delete mode 100644 shared/default.nix diff --git a/Makefile b/Makefile index 962eae00d..0a9b4f29f 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ populate: pkgs:;@$(error no package selected) pkgs.%:;@$(call build,$@) -# usage: make LOGNAME=shared system=wolf eval.config.krebs.build.host.name +# usage: make LOGNAME=krebs system=wolf eval.config.krebs.build.host.name eval eval.:;@$(call evaluate,$${expr-eval}) eval.%:;@$(call evaluate,$@) diff --git a/shared/1systems/test-all-krebs-modules/config.nix b/krebs/1systems/test-all-krebs-modules/config.nix similarity index 93% rename from shared/1systems/test-all-krebs-modules/config.nix rename to krebs/1systems/test-all-krebs-modules/config.nix index 7ebcf3b50..c0c14b71f 100644 --- a/shared/1systems/test-all-krebs-modules/config.nix +++ b/krebs/1systems/test-all-krebs-modules/config.nix @@ -3,11 +3,12 @@ let en = { enable = true;}; in { imports = [ - + + ]; krebs = { enable = true; - build.user = config.krebs.users.shared; + build.user = config.krebs.users.krebs; build.host = config.krebs.hosts.test-all-krebs-modules; Reaktor.test = {}; apt-cacher-ng.enable = true; diff --git a/krebs/1systems/test-all-krebs-modules/source.nix b/krebs/1systems/test-all-krebs-modules/source.nix new file mode 100644 index 000000000..66fdaa773 --- /dev/null +++ b/krebs/1systems/test-all-krebs-modules/source.nix @@ -0,0 +1,3 @@ +import { + name = "test-all-krebs-modules"; +} diff --git a/shared/1systems/test-arch/config.nix b/krebs/1systems/test-arch/config.nix similarity index 90% rename from shared/1systems/test-arch/config.nix rename to krebs/1systems/test-arch/config.nix index 453483d48..b5a4234e7 100644 --- a/shared/1systems/test-arch/config.nix +++ b/krebs/1systems/test-arch/config.nix @@ -2,7 +2,8 @@ { imports = [ - + + { boot.loader.grub = { device = "/dev/sda"; diff --git a/krebs/1systems/test-arch/source.nix b/krebs/1systems/test-arch/source.nix new file mode 100644 index 000000000..bff9d4325 --- /dev/null +++ b/krebs/1systems/test-arch/source.nix @@ -0,0 +1,3 @@ +import { + name = "test-arch"; +} diff --git a/shared/1systems/test-centos6/config.nix b/krebs/1systems/test-centos6/config.nix similarity index 79% rename from shared/1systems/test-centos6/config.nix rename to krebs/1systems/test-centos6/config.nix index a81ff7c51..968f8b8f0 100644 --- a/shared/1systems/test-centos6/config.nix +++ b/krebs/1systems/test-centos6/config.nix @@ -7,8 +7,9 @@ let gw = "168.235.148.1"; in { imports = [ - - + + + { networking.interfaces.enp11s0.ip4 = [ { diff --git a/krebs/1systems/test-centos6/source.nix b/krebs/1systems/test-centos6/source.nix new file mode 100644 index 000000000..3693bbb29 --- /dev/null +++ b/krebs/1systems/test-centos6/source.nix @@ -0,0 +1,3 @@ +import { + name = "test-centos6"; +} diff --git a/krebs/1systems/test-centos7/config.nix b/krebs/1systems/test-centos7/config.nix new file mode 100644 index 000000000..732bc4f17 --- /dev/null +++ b/krebs/1systems/test-centos7/config.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) head; + +in { + imports = [ + + + + + + ]; + + sound.enable = false; + krebs.build.host = config.krebs.hosts.test-centos7; +} diff --git a/krebs/1systems/test-centos7/source.nix b/krebs/1systems/test-centos7/source.nix new file mode 100644 index 000000000..44230f08d --- /dev/null +++ b/krebs/1systems/test-centos7/source.nix @@ -0,0 +1,3 @@ +import { + name = "test-centos7"; +} diff --git a/shared/1systems/test-failing/config.nix b/krebs/1systems/test-failing/config.nix similarity index 68% rename from shared/1systems/test-failing/config.nix rename to krebs/1systems/test-failing/config.nix index fb6a58397..0dc8e6bf8 100644 --- a/shared/1systems/test-failing/config.nix +++ b/krebs/1systems/test-failing/config.nix @@ -2,7 +2,8 @@ { imports = [ - + + ]; programs.ssh.startAgent = true; programs.ssh.startAgent = false; diff --git a/krebs/1systems/test-failing/source.nix b/krebs/1systems/test-failing/source.nix new file mode 100644 index 000000000..60b77a0a0 --- /dev/null +++ b/krebs/1systems/test-failing/source.nix @@ -0,0 +1,3 @@ +import { + name = "test-failing"; +} diff --git a/shared/1systems/test-minimal-deploy/config.nix b/krebs/1systems/test-minimal-deploy/config.nix similarity index 75% rename from shared/1systems/test-minimal-deploy/config.nix rename to krebs/1systems/test-minimal-deploy/config.nix index eab703671..9974b4f7c 100644 --- a/shared/1systems/test-minimal-deploy/config.nix +++ b/krebs/1systems/test-minimal-deploy/config.nix @@ -1,11 +1,12 @@ { config, pkgs, lib, ... }: { imports = [ - + + ]; krebs = { enable = true; - build.user = config.krebs.users.shared; + build.user = config.krebs.users.krebs; build.host = config.krebs.hosts.test-all-krebs-modules; }; # just get the system to eval in nixos without errors diff --git a/krebs/1systems/test-minimal-deploy/source.nix b/krebs/1systems/test-minimal-deploy/source.nix new file mode 100644 index 000000000..032ab12bb --- /dev/null +++ b/krebs/1systems/test-minimal-deploy/source.nix @@ -0,0 +1,3 @@ +import { + name = "test-minimal-deploy"; +} diff --git a/shared/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix similarity index 75% rename from shared/1systems/wolf/config.nix rename to krebs/1systems/wolf/config.nix index 636f8e822..b8cc1b4a1 100644 --- a/shared/1systems/wolf/config.nix +++ b/krebs/1systems/wolf/config.nix @@ -4,24 +4,25 @@ let in { imports = [ - + + - - - + + + - - - - + + + + - - - # - - - - + + + # + + + + ]; # use your own binary cache, fallback use cache.nixos.org (which is used by diff --git a/krebs/1systems/wolf/source.nix b/krebs/1systems/wolf/source.nix new file mode 100644 index 000000000..c292bfa62 --- /dev/null +++ b/krebs/1systems/wolf/source.nix @@ -0,0 +1,3 @@ +import { + name = "wolf"; +} diff --git a/shared/2configs/central-stats-client.nix b/krebs/2configs/central-stats-client.nix similarity index 100% rename from shared/2configs/central-stats-client.nix rename to krebs/2configs/central-stats-client.nix diff --git a/shared/2configs/cgit-mirror.nix b/krebs/2configs/cgit-mirror.nix similarity index 100% rename from shared/2configs/cgit-mirror.nix rename to krebs/2configs/cgit-mirror.nix diff --git a/shared/2configs/collectd-base.nix b/krebs/2configs/collectd-base.nix similarity index 100% rename from shared/2configs/collectd-base.nix rename to krebs/2configs/collectd-base.nix diff --git a/shared/2configs/default.nix b/krebs/2configs/default.nix similarity index 91% rename from shared/2configs/default.nix rename to krebs/2configs/default.nix index 2146f42e8..53ad56d65 100644 --- a/shared/2configs/default.nix +++ b/krebs/2configs/default.nix @@ -5,8 +5,7 @@ with import ; krebs.enable = true; krebs.tinc.retiolum.enable = true; - # TODO rename shared user to "krebs" - krebs.build.user = mkDefault config.krebs.users.shared; + krebs.build.user = mkDefault config.krebs.users.krebs; networking.hostName = config.krebs.build.host.name; diff --git a/shared/2configs/graphite.nix b/krebs/2configs/graphite.nix similarity index 100% rename from shared/2configs/graphite.nix rename to krebs/2configs/graphite.nix diff --git a/shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix b/krebs/2configs/os-templates/CAC-CentOS-6.5-64bit.nix similarity index 100% rename from shared/2configs/os-templates/CAC-CentOS-6.5-64bit.nix rename to krebs/2configs/os-templates/CAC-CentOS-6.5-64bit.nix diff --git a/shared/2configs/os-templates/CAC-CentOS-7-64bit.nix b/krebs/2configs/os-templates/CAC-CentOS-7-64bit.nix similarity index 100% rename from shared/2configs/os-templates/CAC-CentOS-7-64bit.nix rename to krebs/2configs/os-templates/CAC-CentOS-7-64bit.nix diff --git a/shared/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix similarity index 100% rename from shared/2configs/repo-sync.nix rename to krebs/2configs/repo-sync.nix diff --git a/shared/2configs/save-diskspace.nix b/krebs/2configs/save-diskspace.nix similarity index 100% rename from shared/2configs/save-diskspace.nix rename to krebs/2configs/save-diskspace.nix diff --git a/shared/2configs/shack/bincache.nix b/krebs/2configs/shack/bincache.nix similarity index 100% rename from shared/2configs/shack/bincache.nix rename to krebs/2configs/shack/bincache.nix diff --git a/shared/2configs/shack/drivedroid.nix b/krebs/2configs/shack/drivedroid.nix similarity index 100% rename from shared/2configs/shack/drivedroid.nix rename to krebs/2configs/shack/drivedroid.nix diff --git a/shared/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix similarity index 100% rename from shared/2configs/shack/mqtt_sub.nix rename to krebs/2configs/shack/mqtt_sub.nix diff --git a/shared/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix similarity index 100% rename from shared/2configs/shack/muell_caller.nix rename to krebs/2configs/shack/muell_caller.nix diff --git a/shared/2configs/shack/nix-cacher.nix b/krebs/2configs/shack/nix-cacher.nix similarity index 100% rename from shared/2configs/shack/nix-cacher.nix rename to krebs/2configs/shack/nix-cacher.nix diff --git a/shared/2configs/shack/radioactive.nix b/krebs/2configs/shack/radioactive.nix similarity index 100% rename from shared/2configs/shack/radioactive.nix rename to krebs/2configs/shack/radioactive.nix diff --git a/shared/2configs/shack/share.nix b/krebs/2configs/shack/share.nix similarity index 100% rename from shared/2configs/shack/share.nix rename to krebs/2configs/shack/share.nix diff --git a/shared/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix similarity index 100% rename from shared/2configs/shack/worlddomination.nix rename to krebs/2configs/shack/worlddomination.nix diff --git a/shared/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix similarity index 94% rename from shared/2configs/shared-buildbot.nix rename to krebs/2configs/shared-buildbot.nix index 1d6883afe..efb41cc3e 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/krebs/2configs/shared-buildbot.nix @@ -1,9 +1,9 @@ { lib, config, pkgs, ... }: # The buildbot config is self-contained and currently provides a way -# to test "shared" configuration (infrastructure to be used by every krebsminister). +# to test "krebs" configuration (infrastructure to be used by every krebsminister). # You can add your own test, test steps as required. Deploy the config on a -# shared host like wolf and everything should be fine. +# krebs host like wolf and everything should be fine. # TODO for all users schedule a build for fast tests { @@ -56,7 +56,7 @@ test-cac-infest-master = '' # files everyone depends on or are part of the share branch def shared_files(change): - r =re.compile("^((krebs|shared)/.*|Makefile|default.nix)") + r =re.compile("^(krebs/.*|Makefile|default.nix|shell.nix)") for file in change.files: if r.match(file): return True @@ -78,7 +78,7 @@ grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental') env = { - "LOGNAME": "shared", + "LOGNAME": "krebs", "NIX_REMOTE": "daemon", "dummy_secrets": "true", } @@ -173,6 +173,6 @@ packages = with pkgs; [ gnumake jq nix populate ]; # all nix commands will need a working nixpkgs installation extraEnviron = { - NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./shared/1systems/wolf.nix"; }; + NIX_PATH="nixpkgs=/var/src/nixpkgs:nixos-config=./krebs/1systems/wolf.nix"; }; }; } diff --git a/shared/2configs/temp/dirs.nix b/krebs/2configs/temp/dirs.nix similarity index 100% rename from shared/2configs/temp/dirs.nix rename to krebs/2configs/temp/dirs.nix diff --git a/shared/2configs/temp/networking.nix b/krebs/2configs/temp/networking.nix similarity index 100% rename from shared/2configs/temp/networking.nix rename to krebs/2configs/temp/networking.nix diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 081724cfe..6123b6dd9 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -94,10 +94,10 @@ let imp = lib.mkMerge [ { krebs = import ./lass { inherit config; }; } + { krebs = import ./krebs { inherit config; }; } { krebs = import ./makefu { inherit config; }; } { krebs = import ./mv { inherit config; }; } { krebs = import ./nin { inherit config; }; } - { krebs = import ./shared { inherit config; }; } { krebs = import ./tv { inherit config; }; } { krebs.dns.providers = { diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/krebs/default.nix similarity index 92% rename from krebs/3modules/shared/default.nix rename to krebs/3modules/krebs/default.nix index 17179a39f..780aeb1cf 100644 --- a/krebs/3modules/shared/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -8,7 +8,7 @@ let "test-centos7" "test-all-krebs-modules" ] (name: { - owner = config.krebs.users.shared; + owner = config.krebs.users.krebs; inherit name; cores = 1; nets = { @@ -31,7 +31,7 @@ let in { hosts = { wolf = { - owner = config.krebs.users.shared; + owner = config.krebs.users.krebs; nets = { shack = { ip4.addr = "10.42.2.150" ; @@ -67,9 +67,9 @@ in { }; } // testHosts; users = { - shared = { + krebs = { mail = "spam@krebsco.de"; - pubkey = "lol"; # TODO krebs.users.shared.pubkey should be unnecessary + pubkey = "lol"; # TODO krebs.users.krebs.pubkey should be unnecessary }; }; } diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes index 2a3ebd6fc..e89edffcb 100755 --- a/krebs/5pkgs/test/infest-cac-centos7/notes +++ b/krebs/5pkgs/test/infest-cac-centos7/notes @@ -15,7 +15,7 @@ krebs_cred=${krebs_cred-./cac.json} # tinc retiolum key for host retiolum_key=${retiolum_key-./retiolum.rsa_key.priv} # build this host -user=${user:-shared} +user=${user:-krebs} system=${target_system:-test-centos7} log(){ @@ -125,9 +125,9 @@ done clear_defer >/dev/null defer "cac-api delete $id;$old_trapstr" -mkdir -p shared/2configs/temp +mkdir -p krebs/2configs/temp cac-api generatenetworking $id > \ - shared/2configs/temp/networking.nix + krebs/2configs/temp/networking.nix # new temporary ssh key we will use to log in after install ssh-keygen -f $krebs_ssh -N "" cp "$retiolum_key" $krebs_secrets/retiolum.rsa_key.priv @@ -135,7 +135,7 @@ cp "$retiolum_key" $krebs_secrets/retiolum.rsa_key.priv # additionally we set the ssh key we generated ip=$(cac-api getserver $id | jq -r .ip) -cat > shared/2configs/temp/dirs.nix < krebs/2configs/temp/dirs.nix <; host@{ name, secure ? false }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" - else "shared"; - _file = + "/shared/1systems/${name}/source.nix"; + else "krebs"; + _file = + "/krebs/1systems/${name}/source.nix"; in evalSource (toString _file) { - nixos-config.symlink = "stockholm/shared/1systems/${name}/config.nix"; + nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix"; secrets.file = getAttr builder { - buildbot = toString ; - shared = "${getEnv "HOME"}/secrets/krebs/${host.name}"; + buildbot = toString ; + krebs = "${getEnv "HOME"}/secrets/krebs/${host.name}"; }; stockholm.file = toString ; nixpkgs.git = { diff --git a/shared/1systems/test-all-krebs-modules/source.nix b/shared/1systems/test-all-krebs-modules/source.nix deleted file mode 100644 index 58d72365f..000000000 --- a/shared/1systems/test-all-krebs-modules/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-all-krebs-modules"; -} diff --git a/shared/1systems/test-arch/source.nix b/shared/1systems/test-arch/source.nix deleted file mode 100644 index ca2305684..000000000 --- a/shared/1systems/test-arch/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-arch"; -} diff --git a/shared/1systems/test-centos6/source.nix b/shared/1systems/test-centos6/source.nix deleted file mode 100644 index 0c7c78ec0..000000000 --- a/shared/1systems/test-centos6/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-centos6"; -} diff --git a/shared/1systems/test-centos7/config.nix b/shared/1systems/test-centos7/config.nix deleted file mode 100644 index 58f99e87c..000000000 --- a/shared/1systems/test-centos7/config.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - inherit (lib) head; - -in { - imports = [ - - - - - ]; - - sound.enable = false; - krebs.build.host = config.krebs.hosts.test-centos7; -} diff --git a/shared/1systems/test-centos7/source.nix b/shared/1systems/test-centos7/source.nix deleted file mode 100644 index 5144477fe..000000000 --- a/shared/1systems/test-centos7/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-centos7"; -} diff --git a/shared/1systems/test-failing/source.nix b/shared/1systems/test-failing/source.nix deleted file mode 100644 index 3e17d0b52..000000000 --- a/shared/1systems/test-failing/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-failing"; -} diff --git a/shared/1systems/test-minimal-deploy/source.nix b/shared/1systems/test-minimal-deploy/source.nix deleted file mode 100644 index 2368cdd49..000000000 --- a/shared/1systems/test-minimal-deploy/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "test-minimal-deploy"; -} diff --git a/shared/1systems/wolf/source.nix b/shared/1systems/wolf/source.nix deleted file mode 100644 index d2bc4952a..000000000 --- a/shared/1systems/wolf/source.nix +++ /dev/null @@ -1,3 +0,0 @@ -import { - name = "wolf"; -} diff --git a/shared/3modules/default.nix b/shared/3modules/default.nix deleted file mode 100644 index 7fbdb77f4..000000000 --- a/shared/3modules/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# TODO don't require 3modules -_: - -{ -} diff --git a/shared/default.nix b/shared/default.nix deleted file mode 100644 index 320e1a133..000000000 --- a/shared/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: -{ - imports = [ - ../krebs - ./2configs - ./3modules - ]; -}