diff --git a/6tests/data/secrets/auth.nix b/0tests/data/secrets/auth.nix similarity index 100% rename from 6tests/data/secrets/auth.nix rename to 0tests/data/secrets/auth.nix diff --git a/6tests/data/secrets/bepasty-secret.nix b/0tests/data/secrets/bepasty-secret.nix similarity index 100% rename from 6tests/data/secrets/bepasty-secret.nix rename to 0tests/data/secrets/bepasty-secret.nix diff --git a/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname b/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname similarity index 100% rename from 6tests/data/secrets/bgt_cyberwar_hidden_service/hostname rename to 0tests/data/secrets/bgt_cyberwar_hidden_service/hostname diff --git a/6tests/data/secrets/daemon-pw b/0tests/data/secrets/daemon-pw similarity index 100% rename from 6tests/data/secrets/daemon-pw rename to 0tests/data/secrets/daemon-pw diff --git a/6tests/data/secrets/dl.euer.krebsco.de-auth.nix b/0tests/data/secrets/dl.euer.krebsco.de-auth.nix similarity index 100% rename from 6tests/data/secrets/dl.euer.krebsco.de-auth.nix rename to 0tests/data/secrets/dl.euer.krebsco.de-auth.nix diff --git a/6tests/data/secrets/extra-hosts.nix b/0tests/data/secrets/extra-hosts.nix similarity index 100% rename from 6tests/data/secrets/extra-hosts.nix rename to 0tests/data/secrets/extra-hosts.nix diff --git a/6tests/data/secrets/grafana_security.nix b/0tests/data/secrets/grafana_security.nix similarity index 100% rename from 6tests/data/secrets/grafana_security.nix rename to 0tests/data/secrets/grafana_security.nix diff --git a/6tests/data/secrets/hashedPasswords.nix b/0tests/data/secrets/hashedPasswords.nix similarity index 100% rename from 6tests/data/secrets/hashedPasswords.nix rename to 0tests/data/secrets/hashedPasswords.nix diff --git a/6tests/data/secrets/iodinepw.nix b/0tests/data/secrets/iodinepw.nix similarity index 100% rename from 6tests/data/secrets/iodinepw.nix rename to 0tests/data/secrets/iodinepw.nix diff --git a/6tests/data/secrets/kibana-auth.nix b/0tests/data/secrets/kibana-auth.nix similarity index 100% rename from 6tests/data/secrets/kibana-auth.nix rename to 0tests/data/secrets/kibana-auth.nix diff --git a/6tests/data/secrets/nsupdate-data.nix b/0tests/data/secrets/nsupdate-data.nix similarity index 100% rename from 6tests/data/secrets/nsupdate-data.nix rename to 0tests/data/secrets/nsupdate-data.nix diff --git a/6tests/data/secrets/nsupdate-search.nix b/0tests/data/secrets/nsupdate-search.nix similarity index 100% rename from 6tests/data/secrets/nsupdate-search.nix rename to 0tests/data/secrets/nsupdate-search.nix diff --git a/6tests/data/secrets/retiolum-ci.rsa_key.priv b/0tests/data/secrets/retiolum-ci.rsa_key.priv similarity index 100% rename from 6tests/data/secrets/retiolum-ci.rsa_key.priv rename to 0tests/data/secrets/retiolum-ci.rsa_key.priv diff --git a/6tests/data/secrets/retiolum.rsa_key.priv b/0tests/data/secrets/retiolum.rsa_key.priv similarity index 100% rename from 6tests/data/secrets/retiolum.rsa_key.priv rename to 0tests/data/secrets/retiolum.rsa_key.priv diff --git a/6tests/data/secrets/retiolum.rsa_key.pub b/0tests/data/secrets/retiolum.rsa_key.pub similarity index 100% rename from 6tests/data/secrets/retiolum.rsa_key.pub rename to 0tests/data/secrets/retiolum.rsa_key.pub diff --git a/6tests/data/secrets/sambacred b/0tests/data/secrets/sambacred similarity index 100% rename from 6tests/data/secrets/sambacred rename to 0tests/data/secrets/sambacred diff --git a/6tests/data/secrets/shackspace-gitlab-ci-token.nix b/0tests/data/secrets/shackspace-gitlab-ci-token.nix similarity index 100% rename from 6tests/data/secrets/shackspace-gitlab-ci-token.nix rename to 0tests/data/secrets/shackspace-gitlab-ci-token.nix diff --git a/6tests/data/secrets/ssh.id_ed25519 b/0tests/data/secrets/ssh.id_ed25519 similarity index 100% rename from 6tests/data/secrets/ssh.id_ed25519 rename to 0tests/data/secrets/ssh.id_ed25519 diff --git a/6tests/data/secrets/ssh.makefu.id_rsa b/0tests/data/secrets/ssh.makefu.id_rsa similarity index 100% rename from 6tests/data/secrets/ssh.makefu.id_rsa rename to 0tests/data/secrets/ssh.makefu.id_rsa diff --git a/6tests/data/secrets/ssh.makefu.id_rsa.pub b/0tests/data/secrets/ssh.makefu.id_rsa.pub similarity index 100% rename from 6tests/data/secrets/ssh.makefu.id_rsa.pub rename to 0tests/data/secrets/ssh.makefu.id_rsa.pub diff --git a/6tests/data/secrets/ssh_host_ed25519_key b/0tests/data/secrets/ssh_host_ed25519_key similarity index 100% rename from 6tests/data/secrets/ssh_host_ed25519_key rename to 0tests/data/secrets/ssh_host_ed25519_key diff --git a/6tests/data/secrets/ssh_host_rsa_key b/0tests/data/secrets/ssh_host_rsa_key similarity index 100% rename from 6tests/data/secrets/ssh_host_rsa_key rename to 0tests/data/secrets/ssh_host_rsa_key diff --git a/6tests/data/secrets/tinc.krebsco.de.crt b/0tests/data/secrets/tinc.krebsco.de.crt similarity index 100% rename from 6tests/data/secrets/tinc.krebsco.de.crt rename to 0tests/data/secrets/tinc.krebsco.de.crt diff --git a/6tests/data/secrets/tinc.krebsco.de.key b/0tests/data/secrets/tinc.krebsco.de.key similarity index 100% rename from 6tests/data/secrets/tinc.krebsco.de.key rename to 0tests/data/secrets/tinc.krebsco.de.key diff --git a/6tests/data/secrets/tw-pass.ini b/0tests/data/secrets/tw-pass.ini similarity index 100% rename from 6tests/data/secrets/tw-pass.ini rename to 0tests/data/secrets/tw-pass.ini diff --git a/6tests/data/secrets/wildcard.krebsco.de.crt b/0tests/data/secrets/wildcard.krebsco.de.crt similarity index 100% rename from 6tests/data/secrets/wildcard.krebsco.de.crt rename to 0tests/data/secrets/wildcard.krebsco.de.crt diff --git a/6tests/data/secrets/wildcard.krebsco.de.key b/0tests/data/secrets/wildcard.krebsco.de.key similarity index 100% rename from 6tests/data/secrets/wildcard.krebsco.de.key rename to 0tests/data/secrets/wildcard.krebsco.de.key diff --git a/source.nix b/source.nix index 40aeac8..1039ba6 100644 --- a/source.nix +++ b/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";