myServices.databasesCerts = config.myServices.certificates.certConfig;
myServices.ircCerts = config.myServices.certificates.certConfig;
- security.acme2.preliminarySelfsigned = true;
+ security.acme.preliminarySelfsigned = true;
- security.acme2.certs = {
+ security.acme.certs = {
"${name}" = config.myServices.certificates.certConfig // {
domain = config.hostEnv.fqdn;
};
systemd.services = lib.attrsets.mapAttrs' (k: v:
lib.attrsets.nameValuePair "acme-selfsigned-${k}" (lib.mkBefore { script =
(lib.optionalString (builtins.elem "cert.pem" v.plugins) ''
- cp $workdir/server.crt ${config.security.acme2.certs."${k}".directory}/cert.pem
- chown '${v.user}:${v.group}' ${config.security.acme2.certs."${k}".directory}/cert.pem
- chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme2.certs."${k}".directory}/cert.pem
+ cp $workdir/server.crt ${config.security.acme.certs."${k}".directory}/cert.pem
+ chown '${v.user}:${v.group}' ${config.security.acme.certs."${k}".directory}/cert.pem
+ chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme.certs."${k}".directory}/cert.pem
'') +
(lib.optionalString (builtins.elem "chain.pem" v.plugins) ''
- cp $workdir/ca.crt ${config.security.acme2.certs."${k}".directory}/chain.pem
- chown '${v.user}:${v.group}' ${config.security.acme2.certs."${k}".directory}/chain.pem
- chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme2.certs."${k}".directory}/chain.pem
+ cp $workdir/ca.crt ${config.security.acme.certs."${k}".directory}/chain.pem
+ chown '${v.user}:${v.group}' ${config.security.acme.certs."${k}".directory}/chain.pem
+ chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme.certs."${k}".directory}/chain.pem
'')
; })
- ) config.security.acme2.certs // {
+ ) config.security.acme.certs //
+ lib.attrsets.mapAttrs' (k: data:
+ lib.attrsets.nameValuePair "acme-${k}" {
+ serviceConfig.ExecStartPre =
+ let
+ script = pkgs.writeScript "acme-pre-start" ''
+ #!${pkgs.runtimeShell} -e
+ mkdir -p '${data.webroot}/.well-known/acme-challenge'
+ chmod a+w '${data.webroot}/.well-known/acme-challenge'
+ #doesn't work for multiple concurrent runs
+ #chown -R '${data.user}:${data.group}' '${data.webroot}/.well-known/acme-challenge'
+ '';
+ in
+ "+${script}";
+ }
+ ) config.security.acme.certs //
+ {
httpdProd = lib.mkIf config.services.httpd.Prod.enable
{ after = [ "acme-selfsigned-certificates.target" ]; wants = [ "acme-selfsigned-certificates.target" ]; };
httpdTools = lib.mkIf config.services.httpd.Tools.enable