Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
f22111ea95
|
@ -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?
|
||||
|
|
1
makefu/6tests/data/secrets/bepasty-secret.nix
Normal file
1
makefu/6tests/data/secrets/bepasty-secret.nix
Normal file
|
@ -0,0 +1 @@
|
|||
"derp"
|
1
makefu/6tests/data/secrets/hashedPasswords.nix
Normal file
1
makefu/6tests/data/secrets/hashedPasswords.nix
Normal file
|
@ -0,0 +1 @@
|
|||
{}
|
1
makefu/6tests/data/secrets/iodinepw.nix
Normal file
1
makefu/6tests/data/secrets/iodinepw.nix
Normal file
|
@ -0,0 +1 @@
|
|||
"derp"
|
0
makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
Normal file
0
makefu/6tests/data/secrets/retiolum-ci.rsa_key.priv
Normal file
0
makefu/6tests/data/secrets/retiolum.rsa_key.priv
Normal file
0
makefu/6tests/data/secrets/retiolum.rsa_key.priv
Normal file
0
makefu/6tests/data/secrets/retiolum.rsa_key.pub
Normal file
0
makefu/6tests/data/secrets/retiolum.rsa_key.pub
Normal file
0
makefu/6tests/data/secrets/sambacred
Normal file
0
makefu/6tests/data/secrets/sambacred
Normal file
0
makefu/6tests/data/secrets/ssh.makefu.id_rsa
Normal file
0
makefu/6tests/data/secrets/ssh.makefu.id_rsa
Normal file
0
makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
Normal file
0
makefu/6tests/data/secrets/ssh.makefu.id_rsa.pub
Normal file
0
makefu/6tests/data/secrets/ssh_host_ed25519_key
Normal file
0
makefu/6tests/data/secrets/ssh_host_ed25519_key
Normal file
0
makefu/6tests/data/secrets/tinc.krebsco.de.crt
Normal file
0
makefu/6tests/data/secrets/tinc.krebsco.de.crt
Normal file
0
makefu/6tests/data/secrets/tinc.krebsco.de.key
Normal file
0
makefu/6tests/data/secrets/tinc.krebsco.de.key
Normal file
0
makefu/6tests/data/secrets/tw-pass.ini
Normal file
0
makefu/6tests/data/secrets/tw-pass.ini
Normal file
0
makefu/6tests/data/secrets/wildcard.krebsco.de.crt
Normal file
0
makefu/6tests/data/secrets/wildcard.krebsco.de.crt
Normal file
0
makefu/6tests/data/secrets/wildcard.krebsco.de.key
Normal file
0
makefu/6tests/data/secrets/wildcard.krebsco.de.key
Normal file
Loading…
Reference in a new issue