Merge remote-tracking branch 'lass/master'

2018-05-31 10:39:49 +02:00 · 2018-05-31 10:39:49 +02:00 · 3bb1c28014
parent e662842c92 08ba0882bb
commit 3bb1c28014
28 changed files with 2 additions and 2 deletions
--- a/0tests/data/secrets/auth.nix
+++ b/0tests/data/secrets/auth.nix
--- a/0tests/data/secrets/bepasty-secret.nix
+++ b/0tests/data/secrets/bepasty-secret.nix
--- a/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname
+++ b/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname
--- a/0tests/data/secrets/daemon-pw
+++ b/0tests/data/secrets/daemon-pw
--- a/0tests/data/secrets/dl.euer.krebsco.de-auth.nix
+++ b/0tests/data/secrets/dl.euer.krebsco.de-auth.nix
--- a/0tests/data/secrets/extra-hosts.nix
+++ b/0tests/data/secrets/extra-hosts.nix
--- a/0tests/data/secrets/grafana_security.nix
+++ b/0tests/data/secrets/grafana_security.nix
--- a/0tests/data/secrets/hashedPasswords.nix
+++ b/0tests/data/secrets/hashedPasswords.nix
--- a/0tests/data/secrets/iodinepw.nix
+++ b/0tests/data/secrets/iodinepw.nix
--- a/0tests/data/secrets/kibana-auth.nix
+++ b/0tests/data/secrets/kibana-auth.nix
--- a/0tests/data/secrets/nsupdate-data.nix
+++ b/0tests/data/secrets/nsupdate-data.nix
--- a/0tests/data/secrets/nsupdate-search.nix
+++ b/0tests/data/secrets/nsupdate-search.nix
--- a/0tests/data/secrets/retiolum-ci.rsa_key.priv
+++ b/0tests/data/secrets/retiolum-ci.rsa_key.priv
--- a/0tests/data/secrets/retiolum.rsa_key.priv
+++ b/0tests/data/secrets/retiolum.rsa_key.priv
--- a/0tests/data/secrets/retiolum.rsa_key.pub
+++ b/0tests/data/secrets/retiolum.rsa_key.pub
--- a/0tests/data/secrets/sambacred
+++ b/0tests/data/secrets/sambacred
--- a/0tests/data/secrets/shackspace-gitlab-ci-token.nix
+++ b/0tests/data/secrets/shackspace-gitlab-ci-token.nix
--- a/0tests/data/secrets/ssh.id_ed25519
+++ b/0tests/data/secrets/ssh.id_ed25519
--- a/0tests/data/secrets/ssh.makefu.id_rsa
+++ b/0tests/data/secrets/ssh.makefu.id_rsa
--- a/0tests/data/secrets/ssh.makefu.id_rsa.pub
+++ b/0tests/data/secrets/ssh.makefu.id_rsa.pub
--- a/0tests/data/secrets/ssh_host_ed25519_key
+++ b/0tests/data/secrets/ssh_host_ed25519_key
--- a/0tests/data/secrets/ssh_host_rsa_key
+++ b/0tests/data/secrets/ssh_host_rsa_key
--- a/0tests/data/secrets/tinc.krebsco.de.crt
+++ b/0tests/data/secrets/tinc.krebsco.de.crt
--- a/0tests/data/secrets/tinc.krebsco.de.key
+++ b/0tests/data/secrets/tinc.krebsco.de.key
--- a/0tests/data/secrets/tw-pass.ini
+++ b/0tests/data/secrets/tw-pass.ini
--- a/0tests/data/secrets/wildcard.krebsco.de.crt
+++ b/0tests/data/secrets/wildcard.krebsco.de.crt
--- a/0tests/data/secrets/wildcard.krebsco.de.key
+++ b/0tests/data/secrets/wildcard.krebsco.de.key
--- a/source.nix
+++ b/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";