From de84ba1aeb2d2aee4671c6e4ab4f7ea9818d392c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 29 Nov 2020 04:28:42 +0100 Subject: [PATCH] Do not hardcode paths to acme certificates --- mail-server/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail-server/common.nix b/mail-server/common.nix index b20e4c7..2a264a7 100644 --- a/mail-server/common.nix +++ b/mail-server/common.nix @@ -26,7 +26,7 @@ in else if cfg.certificateScheme == 2 then "${cfg.certificateDirectory}/cert-${cfg.fqdn}.pem" else if cfg.certificateScheme == 3 - then "/var/lib/acme/${cfg.fqdn}/fullchain.pem" + then "${config.security.acme.certs.${cfg.fqdn}.directory}/fullchain.pem" else throw "Error: Certificate Scheme must be in { 1, 2, 3 }"; # key :: PATH @@ -35,7 +35,7 @@ in else if cfg.certificateScheme == 2 then "${cfg.certificateDirectory}/key-${cfg.fqdn}.pem" else if cfg.certificateScheme == 3 - then "/var/lib/acme/${cfg.fqdn}/key.pem" + then "${config.security.acme.certs.${cfg.fqdn}.directory}/key.pem" else throw "Error: Certificate Scheme must be in { 1, 2, 3 }"; passwordFiles = let