Merge remote-tracking branch 'origin/staging/jeschli'

27 files changed, 0 insertions, 24 deletions

diff --git a/makefu/6tests/data/secrets/auth.nix b/makefu/6tests/data/secrets/auth.nix
deleted file mode 100644
index 92d5c34a8..000000000
--- a/makefu/6tests/data/secrets/auth.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  user = "password";
-}
diff --git a/makefu/6tests/data/secrets/bepasty-secret.nix b/makefu/6tests/data/secrets/bepasty-secret.nix
deleted file mode 100644
index f5e704702..000000000
--- a/makefu/6tests/data/secrets/bepasty-secret.nix
+++ /dev/null
@@ -1 +0,0 @@
-"derp"
diff --git a/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname b/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname
deleted file mode 100644
index 2ae3807f1..000000000
--- a/makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname
+++ /dev/null
@@ -1 +0,0 @@
-dickbutt2342.onion
diff --git a/makefu/6tests/data/secrets/daemon-pw b/makefu/6tests/data/secrets/daemon-pw
deleted file mode 100644
index e16c76dff..000000000
--- a/makefu/6tests/data/secrets/daemon-pw
+++ /dev/null
@@ -1 +0,0 @@
-""
diff --git a/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix b/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix
deleted file mode 100644
index 0967ef424..000000000
--- a/makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/makefu/6tests/data/secrets/extra-hosts.nix b/makefu/6tests/data/secrets/extra-hosts.nix
deleted file mode 100644
index e16c76dff..000000000
--- a/makefu/6tests/data/secrets/extra-hosts.nix
+++ /dev/null
@@ -1 +0,0 @@
-""
diff --git a/makefu/6tests/data/secrets/grafana_security.nix b/makefu/6tests/data/secrets/grafana_security.nix
deleted file mode 100644
index f9096b7cf..000000000
--- a/makefu/6tests/data/secrets/grafana_security.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  adminUser = "dick";
-  adminPassword = "butt";
-}
-
diff --git a/makefu/6tests/data/secrets/hashedPasswords.nix b/makefu/6tests/data/secrets/hashedPasswords.nix
deleted file mode 100644
index 0967ef424..000000000
--- a/makefu/6tests/data/secrets/hashedPasswords.nix
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/makefu/6tests/data/secrets/iodinepw.nix b/makefu/6tests/data/secrets/iodinepw.nix
deleted file mode 100644
index f5e704702..000000000
--- a/makefu/6tests/data/secrets/iodinepw.nix
+++ /dev/null
@@ -1 +0,0 @@
-"derp"
diff --git a/makefu/6tests/data/secrets/kibana-auth.nix b/makefu/6tests/data/secrets/kibana-auth.nix
deleted file mode 100644
index 80e8f44c1..000000000
--- a/makefu/6tests/data/secrets/kibana-auth.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "dick" = "butt";
-}
-
diff --git a/makefu/6tests/data/secrets/nsupdate-data.nix b/makefu/6tests/data/secrets/nsupdate-data.nix
deleted file mode 100644
index e76c0e87e..000000000
--- a/makefu/6tests/data/secrets/nsupdate-data.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ "lol" = "wut"; }
diff --git a/makefu/6tests/data/secrets/nsupdate-search.nix b/makefu/6tests/data/secrets/nsupdate-search.nix
deleted file mode 100644
index a9646aeb7..000000000
--- a/makefu/6tests/data/secrets/nsupdate-search.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "dick.nsupdate.info" = "butt";
-}
diff --git a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv b/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.priv b/makefu/6tests/data/secrets/retiolum.rsa_key.priv
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/retiolum.rsa_key.priv
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/retiolum.rsa_key.pub b/makefu/6tests/data/secrets/retiolum.rsa_key.pub
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/retiolum.rsa_key.pub
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/sambacred b/makefu/6tests/data/secrets/sambacred
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/sambacred
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix b/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix
deleted file mode 100644
index 963e6db8b..000000000
--- a/makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix
+++ /dev/null
@@ -1 +0,0 @@
-"lol"
diff --git a/makefu/6tests/data/secrets/ssh.id_ed25519 b/makefu/6tests/data/secrets/ssh.id_ed25519
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/ssh.id_ed25519
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa b/makefu/6tests/data/secrets/ssh.makefu.id_rsa
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/ssh.makefu.id_rsa
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub b/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/ssh_host_ed25519_key b/makefu/6tests/data/secrets/ssh_host_ed25519_key
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/ssh_host_ed25519_key
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/ssh_host_rsa_key b/makefu/6tests/data/secrets/ssh_host_rsa_key
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/ssh_host_rsa_key
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.crt b/makefu/6tests/data/secrets/tinc.krebsco.de.crt
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/tinc.krebsco.de.crt
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/tinc.krebsco.de.key b/makefu/6tests/data/secrets/tinc.krebsco.de.key
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/tinc.krebsco.de.key
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/tw-pass.ini b/makefu/6tests/data/secrets/tw-pass.ini
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/tw-pass.ini
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt b/makefu/6tests/data/secrets/wildcard.krebsco.de.crt
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/wildcard.krebsco.de.crt
+++ /dev/null
diff --git a/makefu/6tests/data/secrets/wildcard.krebsco.de.key b/makefu/6tests/data/secrets/wildcard.krebsco.de.key
deleted file mode 100644
index e69de29bb..000000000
--- a/makefu/6tests/data/secrets/wildcard.krebsco.de.key
+++ /dev/null