diff options
| author | makefu <github@syntax-fehler.de> | 2017-04-11 21:37:37 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-04-11 21:37:37 +0200 |
| commit | 8a40e9346e9fbfd20cf53d733f0c2790b1a7f7b1 (patch) | |
| tree | 89a55cebc1825ca1fd385a30fc50c675a33fbfac /makefu/2configs | |
| parent | 4c7f5909d82c368d9dc316d0987eadb4a1ff03e1 (diff) | |
m 2 bepasty-dual: use secretKeyFile
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/bepasty-dual.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix index 936aaf004..ecf5f8a38 100644 --- a/makefu/2configs/bepasty-dual.nix +++ b/makefu/2configs/bepasty-dual.nix @@ -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; }; }; }; diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 2f340a678..7b2e6b617 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -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 { |