From 47c0b0261eabdf230bfc7a375a3a008a04b61c4a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 9 May 2018 11:11:50 +0200 Subject: [PATCH] krebs: 6tests -> 0tests --- krebs/{6tests => 0tests}/data/secrets/grafana_security.nix | 0 krebs/{6tests => 0tests}/data/secrets/hashedPasswords.nix | 0 krebs/{6tests => 0tests}/data/secrets/retiolum.rsa_key.priv | 0 .../data/secrets/shackspace-gitlab-ci-token.nix | 0 krebs/{6tests => 0tests}/data/secrets/ssh.id_ed25519 | 0 krebs/{6tests => 0tests}/data/test-config.nix | 0 krebs/{6tests => 0tests}/data/test-source.nix | 0 krebs/{6tests => 0tests}/default.nix | 0 krebs/{6tests => 0tests}/deploy.nix | 2 +- krebs/3modules/ci.nix | 2 +- krebs/kops.nix | 2 +- krebs/source.nix | 2 +- makefu/{6tests => 0tests}/data/secrets/auth.nix | 0 makefu/{6tests => 0tests}/data/secrets/bepasty-secret.nix | 0 .../data/secrets/bgt_cyberwar_hidden_service/hostname | 0 makefu/{6tests => 0tests}/data/secrets/daemon-pw | 0 .../data/secrets/dl.euer.krebsco.de-auth.nix | 0 makefu/{6tests => 0tests}/data/secrets/extra-hosts.nix | 0 makefu/{6tests => 0tests}/data/secrets/grafana_security.nix | 0 makefu/{6tests => 0tests}/data/secrets/hashedPasswords.nix | 0 makefu/{6tests => 0tests}/data/secrets/iodinepw.nix | 0 makefu/{6tests => 0tests}/data/secrets/kibana-auth.nix | 0 makefu/{6tests => 0tests}/data/secrets/nsupdate-data.nix | 0 makefu/{6tests => 0tests}/data/secrets/nsupdate-search.nix | 0 .../{6tests => 0tests}/data/secrets/retiolum-ci.rsa_key.priv | 0 makefu/{6tests => 0tests}/data/secrets/retiolum.rsa_key.priv | 0 makefu/{6tests => 0tests}/data/secrets/retiolum.rsa_key.pub | 0 makefu/{6tests => 0tests}/data/secrets/sambacred | 0 .../data/secrets/shackspace-gitlab-ci-token.nix | 0 makefu/{6tests => 0tests}/data/secrets/ssh.id_ed25519 | 0 makefu/{6tests => 0tests}/data/secrets/ssh.makefu.id_rsa | 0 makefu/{6tests => 0tests}/data/secrets/ssh.makefu.id_rsa.pub | 0 makefu/{6tests => 0tests}/data/secrets/ssh_host_ed25519_key | 0 makefu/{6tests => 0tests}/data/secrets/ssh_host_rsa_key | 0 makefu/{6tests => 0tests}/data/secrets/tinc.krebsco.de.crt | 0 makefu/{6tests => 0tests}/data/secrets/tinc.krebsco.de.key | 0 makefu/{6tests => 0tests}/data/secrets/tw-pass.ini | 0 .../{6tests => 0tests}/data/secrets/wildcard.krebsco.de.crt | 0 .../{6tests => 0tests}/data/secrets/wildcard.krebsco.de.key | 0 makefu/source.nix | 4 ++-- nin/{6tests => 0tests}/dummysecrets/hashedPasswords.nix | 0 nin/{6tests => 0tests}/dummysecrets/ssh.id_ed25519 | 0 nin/source.nix | 2 +- 43 files changed, 7 insertions(+), 7 deletions(-) rename krebs/{6tests => 0tests}/data/secrets/grafana_security.nix (100%) rename krebs/{6tests => 0tests}/data/secrets/hashedPasswords.nix (100%) rename krebs/{6tests => 0tests}/data/secrets/retiolum.rsa_key.priv (100%) rename krebs/{6tests => 0tests}/data/secrets/shackspace-gitlab-ci-token.nix (100%) rename krebs/{6tests => 0tests}/data/secrets/ssh.id_ed25519 (100%) rename krebs/{6tests => 0tests}/data/test-config.nix (100%) rename krebs/{6tests => 0tests}/data/test-source.nix (100%) rename krebs/{6tests => 0tests}/default.nix (100%) rename krebs/{6tests => 0tests}/deploy.nix (97%) rename makefu/{6tests => 0tests}/data/secrets/auth.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/bepasty-secret.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/bgt_cyberwar_hidden_service/hostname (100%) rename makefu/{6tests => 0tests}/data/secrets/daemon-pw (100%) rename makefu/{6tests => 0tests}/data/secrets/dl.euer.krebsco.de-auth.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/extra-hosts.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/grafana_security.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/hashedPasswords.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/iodinepw.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/kibana-auth.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/nsupdate-data.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/nsupdate-search.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/retiolum-ci.rsa_key.priv (100%) rename makefu/{6tests => 0tests}/data/secrets/retiolum.rsa_key.priv (100%) rename makefu/{6tests => 0tests}/data/secrets/retiolum.rsa_key.pub (100%) rename makefu/{6tests => 0tests}/data/secrets/sambacred (100%) rename makefu/{6tests => 0tests}/data/secrets/shackspace-gitlab-ci-token.nix (100%) rename makefu/{6tests => 0tests}/data/secrets/ssh.id_ed25519 (100%) rename makefu/{6tests => 0tests}/data/secrets/ssh.makefu.id_rsa (100%) rename makefu/{6tests => 0tests}/data/secrets/ssh.makefu.id_rsa.pub (100%) rename makefu/{6tests => 0tests}/data/secrets/ssh_host_ed25519_key (100%) rename makefu/{6tests => 0tests}/data/secrets/ssh_host_rsa_key (100%) rename makefu/{6tests => 0tests}/data/secrets/tinc.krebsco.de.crt (100%) rename makefu/{6tests => 0tests}/data/secrets/tinc.krebsco.de.key (100%) rename makefu/{6tests => 0tests}/data/secrets/tw-pass.ini (100%) rename makefu/{6tests => 0tests}/data/secrets/wildcard.krebsco.de.crt (100%) rename makefu/{6tests => 0tests}/data/secrets/wildcard.krebsco.de.key (100%) rename nin/{6tests => 0tests}/dummysecrets/hashedPasswords.nix (100%) rename nin/{6tests => 0tests}/dummysecrets/ssh.id_ed25519 (100%) diff --git a/krebs/6tests/data/secrets/grafana_security.nix b/krebs/0tests/data/secrets/grafana_security.nix similarity index 100% rename from krebs/6tests/data/secrets/grafana_security.nix rename to krebs/0tests/data/secrets/grafana_security.nix diff --git a/krebs/6tests/data/secrets/hashedPasswords.nix b/krebs/0tests/data/secrets/hashedPasswords.nix similarity index 100% rename from krebs/6tests/data/secrets/hashedPasswords.nix rename to krebs/0tests/data/secrets/hashedPasswords.nix diff --git a/krebs/6tests/data/secrets/retiolum.rsa_key.priv b/krebs/0tests/data/secrets/retiolum.rsa_key.priv similarity index 100% rename from krebs/6tests/data/secrets/retiolum.rsa_key.priv rename to krebs/0tests/data/secrets/retiolum.rsa_key.priv diff --git a/krebs/6tests/data/secrets/shackspace-gitlab-ci-token.nix b/krebs/0tests/data/secrets/shackspace-gitlab-ci-token.nix similarity index 100% rename from krebs/6tests/data/secrets/shackspace-gitlab-ci-token.nix rename to krebs/0tests/data/secrets/shackspace-gitlab-ci-token.nix diff --git a/krebs/6tests/data/secrets/ssh.id_ed25519 b/krebs/0tests/data/secrets/ssh.id_ed25519 similarity index 100% rename from krebs/6tests/data/secrets/ssh.id_ed25519 rename to krebs/0tests/data/secrets/ssh.id_ed25519 diff --git a/krebs/6tests/data/test-config.nix b/krebs/0tests/data/test-config.nix similarity index 100% rename from krebs/6tests/data/test-config.nix rename to krebs/0tests/data/test-config.nix diff --git a/krebs/6tests/data/test-source.nix b/krebs/0tests/data/test-source.nix similarity index 100% rename from krebs/6tests/data/test-source.nix rename to krebs/0tests/data/test-source.nix diff --git a/krebs/6tests/default.nix b/krebs/0tests/default.nix similarity index 100% rename from krebs/6tests/default.nix rename to krebs/0tests/default.nix diff --git a/krebs/6tests/deploy.nix b/krebs/0tests/deploy.nix similarity index 97% rename from krebs/6tests/deploy.nix rename to krebs/0tests/deploy.nix index 156e9239f..d96963500 100644 --- a/krebs/6tests/deploy.nix +++ b/krebs/0tests/deploy.nix @@ -3,7 +3,7 @@ import ({ ... }: let pkgs = import { overlays = [(import ../5pkgs)]; }; - test-config = ; + test-config = ; privKey = '' -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index bb19f0602..e97aa16eb 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -147,7 +147,7 @@ in "dummy_secrets": "true", }, command=[ - "nix-build", "-I", "stockholm=.", "krebs/6tests", + "nix-build", "-I", "stockholm=.", "krebs/0tests", "-A", "{}".format(test) ], timeout=90001 diff --git a/krebs/kops.nix b/krebs/kops.nix index abd60ee5a..561b017b9 100644 --- a/krebs/kops.nix +++ b/krebs/kops.nix @@ -38,7 +38,7 @@ secrets = if test then { - file = toString ; + file = toString ; } else { pass = { diff --git a/krebs/source.nix b/krebs/source.nix index 3ee12b37f..49f464f61 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -14,7 +14,7 @@ in { nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix"; secrets = getAttr builder { - buildbot.file = toString ; + buildbot.file = toString ; krebs.pass = { dir = "${getEnv "HOME"}/brain"; name = "krebs-secrets/${name}"; diff --git a/makefu/6tests/data/secrets/auth.nix b/makefu/0tests/data/secrets/auth.nix similarity index 100% rename from makefu/6tests/data/secrets/auth.nix rename to makefu/0tests/data/secrets/auth.nix diff --git a/makefu/6tests/data/secrets/bepasty-secret.nix b/makefu/0tests/data/secrets/bepasty-secret.nix similarity index 100% rename from makefu/6tests/data/secrets/bepasty-secret.nix rename to makefu/0tests/data/secrets/bepasty-secret.nix diff --git a/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname b/makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname similarity index 100% rename from makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname rename to makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname diff --git a/makefu/6tests/data/secrets/daemon-pw b/makefu/0tests/data/secrets/daemon-pw similarity index 100% rename from makefu/6tests/data/secrets/daemon-pw rename to makefu/0tests/data/secrets/daemon-pw diff --git a/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix b/makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix similarity index 100% rename from makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix rename to makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix diff --git a/makefu/6tests/data/secrets/extra-hosts.nix b/makefu/0tests/data/secrets/extra-hosts.nix similarity index 100% rename from makefu/6tests/data/secrets/extra-hosts.nix rename to makefu/0tests/data/secrets/extra-hosts.nix diff --git a/makefu/6tests/data/secrets/grafana_security.nix b/makefu/0tests/data/secrets/grafana_security.nix similarity index 100% rename from makefu/6tests/data/secrets/grafana_security.nix rename to makefu/0tests/data/secrets/grafana_security.nix diff --git a/makefu/6tests/data/secrets/hashedPasswords.nix b/makefu/0tests/data/secrets/hashedPasswords.nix similarity index 100% rename from makefu/6tests/data/secrets/hashedPasswords.nix rename to makefu/0tests/data/secrets/hashedPasswords.nix diff --git a/makefu/6tests/data/secrets/iodinepw.nix b/makefu/0tests/data/secrets/iodinepw.nix similarity index 100% rename from makefu/6tests/data/secrets/iodinepw.nix rename to makefu/0tests/data/secrets/iodinepw.nix diff --git a/makefu/6tests/data/secrets/kibana-auth.nix b/makefu/0tests/data/secrets/kibana-auth.nix similarity index 100% rename from makefu/6tests/data/secrets/kibana-auth.nix rename to makefu/0tests/data/secrets/kibana-auth.nix diff --git a/makefu/6tests/data/secrets/nsupdate-data.nix b/makefu/0tests/data/secrets/nsupdate-data.nix similarity index 100% rename from makefu/6tests/data/secrets/nsupdate-data.nix rename to makefu/0tests/data/secrets/nsupdate-data.nix diff --git a/makefu/6tests/data/secrets/nsupdate-search.nix b/makefu/0tests/data/secrets/nsupdate-search.nix similarity index 100% rename from makefu/6tests/data/secrets/nsupdate-search.nix rename to makefu/0tests/data/secrets/nsupdate-search.nix diff --git a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv b/makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv similarity index 100% rename from makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv rename to makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.priv b/makefu/0tests/data/secrets/retiolum.rsa_key.priv similarity index 100% rename from makefu/6tests/data/secrets/retiolum.rsa_key.priv rename to makefu/0tests/data/secrets/retiolum.rsa_key.priv diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.pub b/makefu/0tests/data/secrets/retiolum.rsa_key.pub similarity index 100% rename from makefu/6tests/data/secrets/retiolum.rsa_key.pub rename to makefu/0tests/data/secrets/retiolum.rsa_key.pub diff --git a/makefu/6tests/data/secrets/sambacred b/makefu/0tests/data/secrets/sambacred similarity index 100% rename from makefu/6tests/data/secrets/sambacred rename to makefu/0tests/data/secrets/sambacred diff --git a/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix b/makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix similarity index 100% rename from makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix rename to makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix diff --git a/makefu/6tests/data/secrets/ssh.id_ed25519 b/makefu/0tests/data/secrets/ssh.id_ed25519 similarity index 100% rename from makefu/6tests/data/secrets/ssh.id_ed25519 rename to makefu/0tests/data/secrets/ssh.id_ed25519 diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa b/makefu/0tests/data/secrets/ssh.makefu.id_rsa similarity index 100% rename from makefu/6tests/data/secrets/ssh.makefu.id_rsa rename to makefu/0tests/data/secrets/ssh.makefu.id_rsa diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub b/makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub similarity index 100% rename from makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub rename to makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub diff --git a/makefu/6tests/data/secrets/ssh_host_ed25519_key b/makefu/0tests/data/secrets/ssh_host_ed25519_key similarity index 100% rename from makefu/6tests/data/secrets/ssh_host_ed25519_key rename to makefu/0tests/data/secrets/ssh_host_ed25519_key diff --git a/makefu/6tests/data/secrets/ssh_host_rsa_key b/makefu/0tests/data/secrets/ssh_host_rsa_key similarity index 100% rename from makefu/6tests/data/secrets/ssh_host_rsa_key rename to makefu/0tests/data/secrets/ssh_host_rsa_key diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.crt b/makefu/0tests/data/secrets/tinc.krebsco.de.crt similarity index 100% rename from makefu/6tests/data/secrets/tinc.krebsco.de.crt rename to makefu/0tests/data/secrets/tinc.krebsco.de.crt diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.key b/makefu/0tests/data/secrets/tinc.krebsco.de.key similarity index 100% rename from makefu/6tests/data/secrets/tinc.krebsco.de.key rename to makefu/0tests/data/secrets/tinc.krebsco.de.key diff --git a/makefu/6tests/data/secrets/tw-pass.ini b/makefu/0tests/data/secrets/tw-pass.ini similarity index 100% rename from makefu/6tests/data/secrets/tw-pass.ini rename to makefu/0tests/data/secrets/tw-pass.ini diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt b/makefu/0tests/data/secrets/wildcard.krebsco.de.crt similarity index 100% rename from makefu/6tests/data/secrets/wildcard.krebsco.de.crt rename to makefu/0tests/data/secrets/wildcard.krebsco.de.crt diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.key b/makefu/0tests/data/secrets/wildcard.krebsco.de.key similarity index 100% rename from makefu/6tests/data/secrets/wildcard.krebsco.de.key rename to makefu/0tests/data/secrets/wildcard.krebsco.de.key diff --git a/makefu/source.nix b/makefu/source.nix index 40aeac8b6..1039ba654 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -45,7 +45,7 @@ in }; secrets = getAttr builder { - buildbot.file = toString ; + buildbot.file = toString ; makefu.pass = { inherit name; dir = "${getEnv "HOME"}/.secrets-pass"; @@ -79,7 +79,7 @@ in (mkIf ( torrent ) { torrent-secrets = getAttr builder { - buildbot.file = toString ; + buildbot.file = toString ; makefu.pass = { name = "torrent"; dir = "${getEnv "HOME"}/.secrets-pass"; diff --git a/nin/6tests/dummysecrets/hashedPasswords.nix b/nin/0tests/dummysecrets/hashedPasswords.nix similarity index 100% rename from nin/6tests/dummysecrets/hashedPasswords.nix rename to nin/0tests/dummysecrets/hashedPasswords.nix diff --git a/nin/6tests/dummysecrets/ssh.id_ed25519 b/nin/0tests/dummysecrets/ssh.id_ed25519 similarity index 100% rename from nin/6tests/dummysecrets/ssh.id_ed25519 rename to nin/0tests/dummysecrets/ssh.id_ed25519 diff --git a/nin/source.nix b/nin/source.nix index 9fb2cb390..ae13c5583 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -13,7 +13,7 @@ in evalSource (toString _file) { nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix"; secrets.file = getAttr builder { - buildbot = toString ; + buildbot = toString ; nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString ;