diff options
-rw-r--r-- | krebs/0tests/data/secrets/grafana_security.nix (renamed from krebs/6tests/data/secrets/grafana_security.nix) | 0 | ||||
-rw-r--r-- | krebs/0tests/data/secrets/hashedPasswords.nix (renamed from krebs/6tests/data/secrets/hashedPasswords.nix) | 0 | ||||
-rw-r--r-- | krebs/0tests/data/secrets/retiolum.rsa_key.priv (renamed from krebs/6tests/data/secrets/retiolum.rsa_key.priv) | 0 | ||||
-rw-r--r-- | krebs/0tests/data/secrets/shackspace-gitlab-ci-token.nix (renamed from krebs/6tests/data/secrets/shackspace-gitlab-ci-token.nix) | 0 | ||||
-rw-r--r-- | krebs/0tests/data/secrets/ssh.id_ed25519 (renamed from krebs/6tests/data/secrets/ssh.id_ed25519) | 0 | ||||
-rw-r--r-- | krebs/0tests/data/test-config.nix (renamed from krebs/6tests/data/test-config.nix) | 0 | ||||
-rw-r--r-- | krebs/0tests/data/test-source.nix (renamed from krebs/6tests/data/test-source.nix) | 0 | ||||
-rw-r--r-- | krebs/0tests/default.nix (renamed from krebs/6tests/default.nix) | 0 | ||||
-rw-r--r-- | krebs/0tests/deploy.nix (renamed from krebs/6tests/deploy.nix) | 2 | ||||
-rw-r--r-- | krebs/3modules/ci.nix | 2 | ||||
-rw-r--r-- | krebs/kops.nix | 2 | ||||
-rw-r--r-- | krebs/source.nix | 2 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/auth.nix (renamed from makefu/6tests/data/secrets/auth.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/bepasty-secret.nix (renamed from makefu/6tests/data/secrets/bepasty-secret.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname (renamed from makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/daemon-pw (renamed from makefu/6tests/data/secrets/daemon-pw) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix (renamed from makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/extra-hosts.nix (renamed from makefu/6tests/data/secrets/extra-hosts.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/grafana_security.nix (renamed from makefu/6tests/data/secrets/grafana_security.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/hashedPasswords.nix (renamed from makefu/6tests/data/secrets/hashedPasswords.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/iodinepw.nix (renamed from makefu/6tests/data/secrets/iodinepw.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/kibana-auth.nix (renamed from makefu/6tests/data/secrets/kibana-auth.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/nsupdate-data.nix (renamed from makefu/6tests/data/secrets/nsupdate-data.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/nsupdate-search.nix (renamed from makefu/6tests/data/secrets/nsupdate-search.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv (renamed from makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/retiolum.rsa_key.priv (renamed from makefu/6tests/data/secrets/retiolum.rsa_key.priv) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/retiolum.rsa_key.pub (renamed from makefu/6tests/data/secrets/retiolum.rsa_key.pub) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/sambacred (renamed from makefu/6tests/data/secrets/sambacred) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix (renamed from makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/ssh.id_ed25519 (renamed from makefu/6tests/data/secrets/ssh.id_ed25519) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/ssh.makefu.id_rsa (renamed from makefu/6tests/data/secrets/ssh.makefu.id_rsa) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub (renamed from makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/ssh_host_ed25519_key (renamed from makefu/6tests/data/secrets/ssh_host_ed25519_key) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/ssh_host_rsa_key (renamed from makefu/6tests/data/secrets/ssh_host_rsa_key) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/tinc.krebsco.de.crt (renamed from makefu/6tests/data/secrets/tinc.krebsco.de.crt) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/tinc.krebsco.de.key (renamed from makefu/6tests/data/secrets/tinc.krebsco.de.key) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/tw-pass.ini (renamed from makefu/6tests/data/secrets/tw-pass.ini) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/wildcard.krebsco.de.crt (renamed from makefu/6tests/data/secrets/wildcard.krebsco.de.crt) | 0 | ||||
-rw-r--r-- | makefu/0tests/data/secrets/wildcard.krebsco.de.key (renamed from makefu/6tests/data/secrets/wildcard.krebsco.de.key) | 0 | ||||
-rw-r--r-- | makefu/source.nix | 4 | ||||
-rw-r--r-- | nin/0tests/dummysecrets/hashedPasswords.nix (renamed from nin/6tests/dummysecrets/hashedPasswords.nix) | 0 | ||||
-rw-r--r-- | nin/0tests/dummysecrets/ssh.id_ed25519 (renamed from nin/6tests/dummysecrets/ssh.id_ed25519) | 0 | ||||
-rw-r--r-- | nin/source.nix | 2 |
43 files changed, 7 insertions, 7 deletions
diff --git a/krebs/6tests/data/secrets/grafana_security.nix b/krebs/0tests/data/secrets/grafana_security.nix index 0967ef42..0967ef42 100644 --- a/krebs/6tests/data/secrets/grafana_security.nix +++ b/krebs/0tests/data/secrets/grafana_security.nix diff --git a/krebs/6tests/data/secrets/hashedPasswords.nix b/krebs/0tests/data/secrets/hashedPasswords.nix index 0967ef42..0967ef42 100644 --- a/krebs/6tests/data/secrets/hashedPasswords.nix +++ b/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 index e69de29b..e69de29b 100644 --- a/krebs/6tests/data/secrets/retiolum.rsa_key.priv +++ b/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 index 963e6db8..963e6db8 100644 --- a/krebs/6tests/data/secrets/shackspace-gitlab-ci-token.nix +++ b/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 index e69de29b..e69de29b 100644 --- a/krebs/6tests/data/secrets/ssh.id_ed25519 +++ b/krebs/0tests/data/secrets/ssh.id_ed25519 diff --git a/krebs/6tests/data/test-config.nix b/krebs/0tests/data/test-config.nix index f0927ddd..f0927ddd 100644 --- a/krebs/6tests/data/test-config.nix +++ b/krebs/0tests/data/test-config.nix diff --git a/krebs/6tests/data/test-source.nix b/krebs/0tests/data/test-source.nix index dfc6b329..dfc6b329 100644 --- a/krebs/6tests/data/test-source.nix +++ b/krebs/0tests/data/test-source.nix diff --git a/krebs/6tests/default.nix b/krebs/0tests/default.nix index c0ca0029..c0ca0029 100644 --- a/krebs/6tests/default.nix +++ b/krebs/0tests/default.nix diff --git a/krebs/6tests/deploy.nix b/krebs/0tests/deploy.nix index 156e9239..d9696350 100644 --- a/krebs/6tests/deploy.nix +++ b/krebs/0tests/deploy.nix @@ -3,7 +3,7 @@ import <nixpkgs/nixos/tests/make-test.nix> ({ ... }: let pkgs = import <nixpkgs> { overlays = [(import ../5pkgs)]; }; - test-config = <stockholm/krebs/6tests/data/test-config.nix>; + test-config = <stockholm/krebs/0tests/data/test-config.nix>; privKey = '' -----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index bb19f060..e97aa16e 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 abd60ee5..561b017b 100644 --- a/krebs/kops.nix +++ b/krebs/kops.nix @@ -38,7 +38,7 @@ secrets = if test then { - file = toString <stockholm/krebs/6tests/data/secrets>; + file = toString <stockholm/krebs/0tests/data/secrets>; } else { pass = { diff --git a/krebs/source.nix b/krebs/source.nix index 3ee12b37..49f464f6 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 <stockholm/krebs/6tests/data/secrets>; + buildbot.file = toString <stockholm/krebs/0tests/data/secrets>; 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 index 92d5c34a..92d5c34a 100644 --- a/makefu/6tests/data/secrets/auth.nix +++ b/makefu/0tests/data/secrets/auth.nix diff --git a/makefu/6tests/data/secrets/bepasty-secret.nix b/makefu/0tests/data/secrets/bepasty-secret.nix index f5e70470..f5e70470 100644 --- a/makefu/6tests/data/secrets/bepasty-secret.nix +++ b/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 index 2ae3807f..2ae3807f 100644 --- a/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname +++ b/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 index e16c76df..e16c76df 100644 --- a/makefu/6tests/data/secrets/daemon-pw +++ b/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 index 0967ef42..0967ef42 100644 --- a/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix +++ b/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 index e16c76df..e16c76df 100644 --- a/makefu/6tests/data/secrets/extra-hosts.nix +++ b/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 index f9096b7c..f9096b7c 100644 --- a/makefu/6tests/data/secrets/grafana_security.nix +++ b/makefu/0tests/data/secrets/grafana_security.nix diff --git a/makefu/6tests/data/secrets/hashedPasswords.nix b/makefu/0tests/data/secrets/hashedPasswords.nix index 0967ef42..0967ef42 100644 --- a/makefu/6tests/data/secrets/hashedPasswords.nix +++ b/makefu/0tests/data/secrets/hashedPasswords.nix diff --git a/makefu/6tests/data/secrets/iodinepw.nix b/makefu/0tests/data/secrets/iodinepw.nix index f5e70470..f5e70470 100644 --- a/makefu/6tests/data/secrets/iodinepw.nix +++ b/makefu/0tests/data/secrets/iodinepw.nix diff --git a/makefu/6tests/data/secrets/kibana-auth.nix b/makefu/0tests/data/secrets/kibana-auth.nix index 80e8f44c..80e8f44c 100644 --- a/makefu/6tests/data/secrets/kibana-auth.nix +++ b/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 index e76c0e87..e76c0e87 100644 --- a/makefu/6tests/data/secrets/nsupdate-data.nix +++ b/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 index a9646aeb..a9646aeb 100644 --- a/makefu/6tests/data/secrets/nsupdate-search.nix +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/retiolum.rsa_key.priv +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/retiolum.rsa_key.pub +++ b/makefu/0tests/data/secrets/retiolum.rsa_key.pub diff --git a/makefu/6tests/data/secrets/sambacred b/makefu/0tests/data/secrets/sambacred index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/sambacred +++ b/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 index 963e6db8..963e6db8 100644 --- a/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/ssh.id_ed25519 +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/ssh.makefu.id_rsa +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/ssh_host_ed25519_key +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/ssh_host_rsa_key +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/tinc.krebsco.de.crt +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/tinc.krebsco.de.key +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/tw-pass.ini +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt +++ b/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 index e69de29b..e69de29b 100644 --- a/makefu/6tests/data/secrets/wildcard.krebsco.de.key +++ b/makefu/0tests/data/secrets/wildcard.krebsco.de.key diff --git a/makefu/source.nix b/makefu/source.nix index 40aeac8b..1039ba65 100644 --- a/makefu/source.nix +++ b/makefu/source.nix @@ -45,7 +45,7 @@ in }; secrets = getAttr builder { - buildbot.file = toString <stockholm/makefu/6tests/data/secrets>; + buildbot.file = toString <stockholm/makefu/0tests/data/secrets>; makefu.pass = { inherit name; dir = "${getEnv "HOME"}/.secrets-pass"; @@ -79,7 +79,7 @@ in (mkIf ( torrent ) { torrent-secrets = getAttr builder { - buildbot.file = toString <stockholm/makefu/6tests/data/secrets>; + buildbot.file = toString <stockholm/makefu/0tests/data/secrets>; makefu.pass = { name = "torrent"; dir = "${getEnv "HOME"}/.secrets-pass"; diff --git a/nin/6tests/dummysecrets/hashedPasswords.nix b/nin/0tests/dummysecrets/hashedPasswords.nix index 0967ef42..0967ef42 100644 --- a/nin/6tests/dummysecrets/hashedPasswords.nix +++ b/nin/0tests/dummysecrets/hashedPasswords.nix diff --git a/nin/6tests/dummysecrets/ssh.id_ed25519 b/nin/0tests/dummysecrets/ssh.id_ed25519 index e69de29b..e69de29b 100644 --- a/nin/6tests/dummysecrets/ssh.id_ed25519 +++ b/nin/0tests/dummysecrets/ssh.id_ed25519 diff --git a/nin/source.nix b/nin/source.nix index 9fb2cb39..ae13c558 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 <stockholm/nin/6tests/dummysecrets>; + buildbot = toString <stockholm/nin/0tests/dummysecrets>; nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString <stockholm>; |