makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects 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 7be61ff2cd
commit d52e271822
2 changed files with 4 additions and 4 deletions

6
2configs/bepasty-dual.nix
View file

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

2
2configs/default.nix
View file

@ -22,7 +22,7 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu; user = config.krebs.users.makefu;
source = let source = let
inherit (config.krebs.build) host user; 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 { in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{ {