From 47c0b0261eabdf230bfc7a375a3a008a04b61c4a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 9 May 2018 11:11:50 +0200 Subject: krebs: 6tests -> 0tests --- makefu/0tests/data/secrets/auth.nix | 3 +++ makefu/0tests/data/secrets/bepasty-secret.nix | 1 + makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname | 1 + makefu/0tests/data/secrets/daemon-pw | 1 + makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix | 1 + makefu/0tests/data/secrets/extra-hosts.nix | 1 + makefu/0tests/data/secrets/grafana_security.nix | 5 +++++ makefu/0tests/data/secrets/hashedPasswords.nix | 1 + makefu/0tests/data/secrets/iodinepw.nix | 1 + makefu/0tests/data/secrets/kibana-auth.nix | 4 ++++ makefu/0tests/data/secrets/nsupdate-data.nix | 1 + makefu/0tests/data/secrets/nsupdate-search.nix | 3 +++ makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv | 0 makefu/0tests/data/secrets/retiolum.rsa_key.priv | 0 makefu/0tests/data/secrets/retiolum.rsa_key.pub | 0 makefu/0tests/data/secrets/sambacred | 0 makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix | 1 + makefu/0tests/data/secrets/ssh.id_ed25519 | 0 makefu/0tests/data/secrets/ssh.makefu.id_rsa | 0 makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub | 0 makefu/0tests/data/secrets/ssh_host_ed25519_key | 0 makefu/0tests/data/secrets/ssh_host_rsa_key | 0 makefu/0tests/data/secrets/tinc.krebsco.de.crt | 0 makefu/0tests/data/secrets/tinc.krebsco.de.key | 0 makefu/0tests/data/secrets/tw-pass.ini | 0 makefu/0tests/data/secrets/wildcard.krebsco.de.crt | 0 makefu/0tests/data/secrets/wildcard.krebsco.de.key | 0 makefu/6tests/data/secrets/auth.nix | 3 --- makefu/6tests/data/secrets/bepasty-secret.nix | 1 - makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname | 1 - makefu/6tests/data/secrets/daemon-pw | 1 - makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix | 1 - makefu/6tests/data/secrets/extra-hosts.nix | 1 - makefu/6tests/data/secrets/grafana_security.nix | 5 ----- makefu/6tests/data/secrets/hashedPasswords.nix | 1 - makefu/6tests/data/secrets/iodinepw.nix | 1 - makefu/6tests/data/secrets/kibana-auth.nix | 4 ---- makefu/6tests/data/secrets/nsupdate-data.nix | 1 - makefu/6tests/data/secrets/nsupdate-search.nix | 3 --- makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv | 0 makefu/6tests/data/secrets/retiolum.rsa_key.priv | 0 makefu/6tests/data/secrets/retiolum.rsa_key.pub | 0 makefu/6tests/data/secrets/sambacred | 0 makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix | 1 - makefu/6tests/data/secrets/ssh.id_ed25519 | 0 makefu/6tests/data/secrets/ssh.makefu.id_rsa | 0 makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub | 0 makefu/6tests/data/secrets/ssh_host_ed25519_key | 0 makefu/6tests/data/secrets/ssh_host_rsa_key | 0 makefu/6tests/data/secrets/tinc.krebsco.de.crt | 0 makefu/6tests/data/secrets/tinc.krebsco.de.key | 0 makefu/6tests/data/secrets/tw-pass.ini | 0 makefu/6tests/data/secrets/wildcard.krebsco.de.crt | 0 makefu/6tests/data/secrets/wildcard.krebsco.de.key | 0 makefu/source.nix | 4 ++-- 55 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 makefu/0tests/data/secrets/auth.nix create mode 100644 makefu/0tests/data/secrets/bepasty-secret.nix create mode 100644 makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname create mode 100644 makefu/0tests/data/secrets/daemon-pw create mode 100644 makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix create mode 100644 makefu/0tests/data/secrets/extra-hosts.nix create mode 100644 makefu/0tests/data/secrets/grafana_security.nix create mode 100644 makefu/0tests/data/secrets/hashedPasswords.nix create mode 100644 makefu/0tests/data/secrets/iodinepw.nix create mode 100644 makefu/0tests/data/secrets/kibana-auth.nix create mode 100644 makefu/0tests/data/secrets/nsupdate-data.nix create mode 100644 makefu/0tests/data/secrets/nsupdate-search.nix create mode 100644 makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv create mode 100644 makefu/0tests/data/secrets/retiolum.rsa_key.priv create mode 100644 makefu/0tests/data/secrets/retiolum.rsa_key.pub create mode 100644 makefu/0tests/data/secrets/sambacred create mode 100644 makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix create mode 100644 makefu/0tests/data/secrets/ssh.id_ed25519 create mode 100644 makefu/0tests/data/secrets/ssh.makefu.id_rsa create mode 100644 makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub create mode 100644 makefu/0tests/data/secrets/ssh_host_ed25519_key create mode 100644 makefu/0tests/data/secrets/ssh_host_rsa_key create mode 100644 makefu/0tests/data/secrets/tinc.krebsco.de.crt create mode 100644 makefu/0tests/data/secrets/tinc.krebsco.de.key create mode 100644 makefu/0tests/data/secrets/tw-pass.ini create mode 100644 makefu/0tests/data/secrets/wildcard.krebsco.de.crt create mode 100644 makefu/0tests/data/secrets/wildcard.krebsco.de.key delete mode 100644 makefu/6tests/data/secrets/auth.nix delete mode 100644 makefu/6tests/data/secrets/bepasty-secret.nix delete mode 100644 makefu/6tests/data/secrets/bgt_cyberwar_hidden_service/hostname delete mode 100644 makefu/6tests/data/secrets/daemon-pw delete mode 100644 makefu/6tests/data/secrets/dl.euer.krebsco.de-auth.nix delete mode 100644 makefu/6tests/data/secrets/extra-hosts.nix delete mode 100644 makefu/6tests/data/secrets/grafana_security.nix delete mode 100644 makefu/6tests/data/secrets/hashedPasswords.nix delete mode 100644 makefu/6tests/data/secrets/iodinepw.nix delete mode 100644 makefu/6tests/data/secrets/kibana-auth.nix delete mode 100644 makefu/6tests/data/secrets/nsupdate-data.nix delete mode 100644 makefu/6tests/data/secrets/nsupdate-search.nix delete mode 100644 makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv delete mode 100644 makefu/6tests/data/secrets/retiolum.rsa_key.priv delete mode 100644 makefu/6tests/data/secrets/retiolum.rsa_key.pub delete mode 100644 makefu/6tests/data/secrets/sambacred delete mode 100644 makefu/6tests/data/secrets/shackspace-gitlab-ci-token.nix delete mode 100644 makefu/6tests/data/secrets/ssh.id_ed25519 delete mode 100644 makefu/6tests/data/secrets/ssh.makefu.id_rsa delete mode 100644 makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub delete mode 100644 makefu/6tests/data/secrets/ssh_host_ed25519_key delete mode 100644 makefu/6tests/data/secrets/ssh_host_rsa_key delete mode 100644 makefu/6tests/data/secrets/tinc.krebsco.de.crt delete mode 100644 makefu/6tests/data/secrets/tinc.krebsco.de.key delete mode 100644 makefu/6tests/data/secrets/tw-pass.ini delete mode 100644 makefu/6tests/data/secrets/wildcard.krebsco.de.crt delete mode 100644 makefu/6tests/data/secrets/wildcard.krebsco.de.key (limited to 'makefu') diff --git a/makefu/0tests/data/secrets/auth.nix b/makefu/0tests/data/secrets/auth.nix new file mode 100644 index 00000000..92d5c34a --- /dev/null +++ b/makefu/0tests/data/secrets/auth.nix @@ -0,0 +1,3 @@ +{ + user = "password"; +} diff --git a/makefu/0tests/data/secrets/bepasty-secret.nix b/makefu/0tests/data/secrets/bepasty-secret.nix new file mode 100644 index 00000000..f5e70470 --- /dev/null +++ b/makefu/0tests/data/secrets/bepasty-secret.nix @@ -0,0 +1 @@ +"derp" diff --git a/makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname b/makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname new file mode 100644 index 00000000..2ae3807f --- /dev/null +++ b/makefu/0tests/data/secrets/bgt_cyberwar_hidden_service/hostname @@ -0,0 +1 @@ +dickbutt2342.onion diff --git a/makefu/0tests/data/secrets/daemon-pw b/makefu/0tests/data/secrets/daemon-pw new file mode 100644 index 00000000..e16c76df --- /dev/null +++ b/makefu/0tests/data/secrets/daemon-pw @@ -0,0 +1 @@ +"" diff --git a/makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix b/makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/makefu/0tests/data/secrets/dl.euer.krebsco.de-auth.nix @@ -0,0 +1 @@ +{} diff --git a/makefu/0tests/data/secrets/extra-hosts.nix b/makefu/0tests/data/secrets/extra-hosts.nix new file mode 100644 index 00000000..e16c76df --- /dev/null +++ b/makefu/0tests/data/secrets/extra-hosts.nix @@ -0,0 +1 @@ +"" diff --git a/makefu/0tests/data/secrets/grafana_security.nix b/makefu/0tests/data/secrets/grafana_security.nix new file mode 100644 index 00000000..f9096b7c --- /dev/null +++ b/makefu/0tests/data/secrets/grafana_security.nix @@ -0,0 +1,5 @@ +{ + adminUser = "dick"; + adminPassword = "butt"; +} + diff --git a/makefu/0tests/data/secrets/hashedPasswords.nix b/makefu/0tests/data/secrets/hashedPasswords.nix new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/makefu/0tests/data/secrets/hashedPasswords.nix @@ -0,0 +1 @@ +{} diff --git a/makefu/0tests/data/secrets/iodinepw.nix b/makefu/0tests/data/secrets/iodinepw.nix new file mode 100644 index 00000000..f5e70470 --- /dev/null +++ b/makefu/0tests/data/secrets/iodinepw.nix @@ -0,0 +1 @@ +"derp" diff --git a/makefu/0tests/data/secrets/kibana-auth.nix b/makefu/0tests/data/secrets/kibana-auth.nix new file mode 100644 index 00000000..80e8f44c --- /dev/null +++ b/makefu/0tests/data/secrets/kibana-auth.nix @@ -0,0 +1,4 @@ +{ + "dick" = "butt"; +} + diff --git a/makefu/0tests/data/secrets/nsupdate-data.nix b/makefu/0tests/data/secrets/nsupdate-data.nix new file mode 100644 index 00000000..e76c0e87 --- /dev/null +++ b/makefu/0tests/data/secrets/nsupdate-data.nix @@ -0,0 +1 @@ +{ "lol" = "wut"; } diff --git a/makefu/0tests/data/secrets/nsupdate-search.nix b/makefu/0tests/data/secrets/nsupdate-search.nix new file mode 100644 index 00000000..a9646aeb --- /dev/null +++ b/makefu/0tests/data/secrets/nsupdate-search.nix @@ -0,0 +1,3 @@ +{ + "dick.nsupdate.info" = "butt"; +} diff --git a/makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv b/makefu/0tests/data/secrets/retiolum-ci.rsa_key.priv new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/retiolum.rsa_key.priv b/makefu/0tests/data/secrets/retiolum.rsa_key.priv new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/retiolum.rsa_key.pub b/makefu/0tests/data/secrets/retiolum.rsa_key.pub new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/sambacred b/makefu/0tests/data/secrets/sambacred new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix b/makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix new file mode 100644 index 00000000..963e6db8 --- /dev/null +++ b/makefu/0tests/data/secrets/shackspace-gitlab-ci-token.nix @@ -0,0 +1 @@ +"lol" diff --git a/makefu/0tests/data/secrets/ssh.id_ed25519 b/makefu/0tests/data/secrets/ssh.id_ed25519 new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/ssh.makefu.id_rsa b/makefu/0tests/data/secrets/ssh.makefu.id_rsa new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub b/makefu/0tests/data/secrets/ssh.makefu.id_rsa.pub new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/ssh_host_ed25519_key b/makefu/0tests/data/secrets/ssh_host_ed25519_key new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/ssh_host_rsa_key b/makefu/0tests/data/secrets/ssh_host_rsa_key new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/tinc.krebsco.de.crt b/makefu/0tests/data/secrets/tinc.krebsco.de.crt new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/tinc.krebsco.de.key b/makefu/0tests/data/secrets/tinc.krebsco.de.key new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/tw-pass.ini b/makefu/0tests/data/secrets/tw-pass.ini new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/wildcard.krebsco.de.crt b/makefu/0tests/data/secrets/wildcard.krebsco.de.crt new file mode 100644 index 00000000..e69de29b diff --git a/makefu/0tests/data/secrets/wildcard.krebsco.de.key b/makefu/0tests/data/secrets/wildcard.krebsco.de.key new file mode 100644 index 00000000..e69de29b diff --git a/makefu/6tests/data/secrets/auth.nix b/makefu/6tests/data/secrets/auth.nix deleted file mode 100644 index 92d5c34a..00000000 --- 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 f5e70470..00000000 --- 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 2ae3807f..00000000 --- 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 e16c76df..00000000 --- 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 0967ef42..00000000 --- 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 e16c76df..00000000 --- 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 f9096b7c..00000000 --- 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 0967ef42..00000000 --- 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 f5e70470..00000000 --- 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 80e8f44c..00000000 --- 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 e76c0e87..00000000 --- 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 a9646aeb..00000000 --- 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 e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 diff --git a/makefu/6tests/data/secrets/sambacred b/makefu/6tests/data/secrets/sambacred deleted file mode 100644 index e69de29b..00000000 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 963e6db8..00000000 --- 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 e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 diff --git a/makefu/6tests/data/secrets/tw-pass.ini b/makefu/6tests/data/secrets/tw-pass.ini deleted file mode 100644 index e69de29b..00000000 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 e69de29b..00000000 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 e69de29b..00000000 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 ; + 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"; -- cgit v1.2.3