diff options
| author | Lucas Savva <lucas@m1cr0man.com> | 2020-10-24 20:40:02 +0100 |
|---|---|---|
| committer | Lucas Savva <lucas@m1cr0man.com> | 2020-10-24 20:40:02 +0100 |
| commit | 79ecf069f5d71fb151b895b7de5f3d0fae7ce32a (patch) | |
| tree | ee8fc26cd8957864d5f3c4c25c66555cba319ba4 | |
| parent | 76401c9a3b9525032958f10843090a6737abc91e (diff) | |
| download | nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.tar nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.tar.gz nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.tar.bz2 nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.tar.lz nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.tar.xz nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.tar.zst nixpkgs-79ecf069f5d71fb151b895b7de5f3d0fae7ce32a.zip | |
nixos/acme: Add data.email to othersHash in nixos > 20.09
| -rw-r--r-- | nixos/modules/security/acme.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 3734a06c3fa..69f5a4e4cae 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -104,7 +104,12 @@ let mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); certDir = mkHash hashData; domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; - othersHash = mkHash "${toString acmeServer} ${data.keyType}"; + othersHash = mkHash ( + "${toString acmeServer} ${data.keyType}" + + ( + optionalString (versionOlder "20.09" config.system.stateVersion) data.email + ) + ); accountDir = "/var/lib/acme/.lego/accounts/" + othersHash; protocolOpts = if useDns then ( |