Merge remote-tracking branch 'gum/master'

16 files changed, 6 insertions, 1 deletions

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index a753e677..422927b2 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -26,7 +26,9 @@ with config.krebs.lib;
           url = https://github.com/nixos/nixpkgs;
           rev = "63b9785"; # stable @ 2016-06-01
         };
-        secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
+        secrets = if getEnv "dummy_secrets" == "true"
+                  then toString <stockholm/makefu/6tests/data/secrets>
+                  else "/home/makefu/secrets/${config.krebs.build.host.name}";
         stockholm = "/home/makefu/stockholm";
 
         # Defaults for all stockholm users?
diff --git a/makefu/6tests/data/secrets/bepasty-secret.nix b/makefu/6tests/data/secrets/bepasty-secret.nix
new file mode 100644
index 00000000..f5e70470
--- /dev/null
+++ b/makefu/6tests/data/secrets/bepasty-secret.nix
@@ -0,0 +1 @@
+"derp"
diff --git a/makefu/6tests/data/secrets/hashedPasswords.nix b/makefu/6tests/data/secrets/hashedPasswords.nix
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/makefu/6tests/data/secrets/hashedPasswords.nix
@@ -0,0 +1 @@
+{}
diff --git a/makefu/6tests/data/secrets/iodinepw.nix b/makefu/6tests/data/secrets/iodinepw.nix
new file mode 100644
index 00000000..f5e70470
--- /dev/null
+++ b/makefu/6tests/data/secrets/iodinepw.nix
@@ -0,0 +1 @@
+"derp"
diff --git a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv b/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.priv b/makefu/6tests/data/secrets/retiolum.rsa_key.priv
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/retiolum.rsa_key.priv
diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.pub b/makefu/6tests/data/secrets/retiolum.rsa_key.pub
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/retiolum.rsa_key.pub
diff --git a/makefu/6tests/data/secrets/sambacred b/makefu/6tests/data/secrets/sambacred
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/sambacred
diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa b/makefu/6tests/data/secrets/ssh.makefu.id_rsa
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/ssh.makefu.id_rsa
diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub b/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
diff --git a/makefu/6tests/data/secrets/ssh_host_ed25519_key b/makefu/6tests/data/secrets/ssh_host_ed25519_key
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/ssh_host_ed25519_key
diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.crt b/makefu/6tests/data/secrets/tinc.krebsco.de.crt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/tinc.krebsco.de.crt
diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.key b/makefu/6tests/data/secrets/tinc.krebsco.de.key
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/tinc.krebsco.de.key
diff --git a/makefu/6tests/data/secrets/tw-pass.ini b/makefu/6tests/data/secrets/tw-pass.ini
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/tw-pass.ini
diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt b/makefu/6tests/data/secrets/wildcard.krebsco.de.crt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/wildcard.krebsco.de.crt
diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.key b/makefu/6tests/data/secrets/wildcard.krebsco.de.key
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/makefu/6tests/data/secrets/wildcard.krebsco.de.key