motiejus/config
1
Fork 0
Code Packages Releases Activity

nsd-acme: misc fixes

Browse Source
This commit is contained in:
Motiejus Jakštys 2023-08-09 15:37:03 +03:00
parent 9a456192af
commit 69e6734eb7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/services/nsd-acme/default.nix
View File

@ -123,18 +123,18 @@ in {
path = [pkgs.openssh pkgs.nsd]; path = [pkgs.openssh pkgs.nsd];
preStart = '' preStart = ''
mkdir -p "$STATE_DIRECTORY/private" mkdir -p "$STATE_DIRECTORY/private"
ln -sf "$CREDENTIALS_DIRECTORY/letsenctypt-account.key" \ ln -sf "$CREDENTIALS_DIRECTORY/letsencrypt-account-key" \
"$STATE_DIRECTORY/private/key.pem" "$STATE_DIRECTORY/private/key.pem"
''; '';
serviceConfig = { serviceConfig = {
ExecStart = let ExecStart = let
hook = mkHook zone; hook = mkHook zone;
days = "--days ${builtins.toString cfg.days}"; days = builtins.toString cfg.days;
staging = staging =
if cfg.staging if cfg.staging
then "--staging" then "--staging"
else ""; else "";
in "${pkgs.uacme} --verbose --days ${days} --hook ${hook} ${staging} issue ${zone}"; in "${pkgs.uacme}/bin/uacme -c \"$STATE_DIRECTORY\" --verbose --days ${days} --hook ${hook} ${staging} issue ${zone}";
DynamicUser = "yes"; DynamicUser = "yes";
StateDirectory = "nsd-acme/${sanitized}"; StateDirectory = "nsd-acme/${sanitized}";
RuntimeDirectory = "nsd-acme/${sanitized}"; RuntimeDirectory = "nsd-acme/${sanitized}";
@ -145,7 +145,7 @@ in {
"nsd_control.pem:${rc.controlCertFile}" "nsd_control.pem:${rc.controlCertFile}"
"nsd_server.key:${rc.serverKeyFile}" "nsd_server.key:${rc.serverKeyFile}"
"nsd_server.pem:${rc.serverCertFile}" "nsd_server.pem:${rc.serverCertFile}"
"letsencrypt-account.key:${cfg.accountKey}" "letsencrypt-account-key:${cfg.accountKey}"
]; ];
}; };
} }