Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 2 bepasty-dual: use secretKeyFile

Browse Source
This commit is contained in:
makefu 2017-04-11 21:37:37 +02:00
parent 4c7f5909d8
commit 8a40e9346e
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefu/2configs/bepasty-dual.nix
View File

@ -14,7 +14,7 @@ with import <stockholm/lib>;
let
sec = toString <secrets>;
# secKey is nothing worth protecting on a local machine
secKey = import <secrets/bepasty-secret.nix>;
secKey = "${secrets}/bepasty-secret";
acmepath = "/var/lib/acme/";
acmechall = acmepath + "/challenges/";
ext-dom = "paste.krebsco.de" ;
@ -31,7 +31,7 @@ in {
serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
};
defaultPermissions = "admin,list,create,read,delete";
secretKey = secKey;
secretKeyFile = secKey;
};
"${ext-dom}" = {
@ -41,7 +41,7 @@ in {
enableACME = true;
};
defaultPermissions = "read";
secretKey = secKey;
secretKeyFile = secKey;
};
};
};

2
makefu/2configs/default.nix
View File

@ -22,7 +22,7 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
ref = "3ff00fa"; # unstable @ 2017-03-31 + cups-dymo
ref = "2982661"; # unstable @ 2017-03-31 + cups-dymo + snapraid-11.1
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{