gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/acme: do not limit credentials functionality to DNS/S3 config

Browse Source
This commit is contained in:
Piotr Dobrowolski
2024-10-13 22:48:14 +02:00
parent ae88a07753
commit 6e6fc7ca26
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/security/acme/default.nix
+3 -6
View File
@@ -183,7 +183,6 @@ let
certToConfig = cert: data: let
acmeServer = data.server;
useDns = data.dnsProvider != null;
useDnsOrS3 = useDns || data.s3Bucket != null;
destPath = "/var/lib/acme/${cert}";
selfsignedDeps = lib.optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ];
@@ -367,13 +366,11 @@ let
"/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates"
];
EnvironmentFile = lib.mkIf useDnsOrS3 data.environmentFile;
EnvironmentFile = lib.mkIf (data.environmentFile != null) data.environmentFile;
Environment = lib.mkIf useDnsOrS3
(lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles);
Environment = lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles;
LoadCredential = lib.mkIf useDnsOrS3
(lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles);
LoadCredential = lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles;
# Run as root (Prefixed with +)
ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" ''