diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-17 01:43:18 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-17 01:43:18 +0200 |
commit | 9ade8f6eb774dc7d19d82a070199b5024786b819 (patch) | |
tree | e5a2d49050d4a426fa1d0412d88bbfab11b500d3 /nixops/modules/certificates.nix | |
parent | 182ae57f53731be220075bc87aff4d47a35563b8 (diff) | |
download | Nix-9ade8f6eb774dc7d19d82a070199b5024786b819.tar.gz Nix-9ade8f6eb774dc7d19d82a070199b5024786b819.tar.zst Nix-9ade8f6eb774dc7d19d82a070199b5024786b819.zip |
Use acme directory config rather than hardcoding the value
Diffstat (limited to 'nixops/modules/certificates.nix')
-rw-r--r-- | nixops/modules/certificates.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixops/modules/certificates.nix b/nixops/modules/certificates.nix index 9a9974e..72896fd 100644 --- a/nixops/modules/certificates.nix +++ b/nixops/modules/certificates.nix | |||
@@ -3,7 +3,7 @@ | |||
3 | options.services.myCertificates = { | 3 | options.services.myCertificates = { |
4 | certConfig = lib.mkOption { | 4 | certConfig = lib.mkOption { |
5 | default = { | 5 | default = { |
6 | webroot = "/var/lib/acme/acme-challenge"; | 6 | webroot = "${config.security.acme.directory}/acme-challenge"; |
7 | email = "ismael@bouya.org"; | 7 | email = "ismael@bouya.org"; |
8 | postRun = '' | 8 | postRun = '' |
9 | systemctl reload httpdTools.service httpdInte.service httpdProd.service | 9 | systemctl reload httpdTools.service httpdInte.service httpdProd.service |
@@ -29,14 +29,14 @@ | |||
29 | systemd.services = lib.attrsets.mapAttrs' (k: v: | 29 | systemd.services = lib.attrsets.mapAttrs' (k: v: |
30 | lib.attrsets.nameValuePair "acme-selfsigned-${k}" (lib.mkBefore { script = | 30 | lib.attrsets.nameValuePair "acme-selfsigned-${k}" (lib.mkBefore { script = |
31 | (lib.optionalString (builtins.elem "cert.pem" v.plugins) '' | 31 | (lib.optionalString (builtins.elem "cert.pem" v.plugins) '' |
32 | cp $workdir/server.crt /var/lib/acme/${k}/cert.pem | 32 | cp $workdir/server.crt ${config.security.acme.directory}/${k}/cert.pem |
33 | chown '${v.user}:${v.group}' /var/lib/acme/${k}/cert.pem | 33 | chown '${v.user}:${v.group}' ${config.security.acme.directory}/${k}/cert.pem |
34 | chmod ${if v.allowKeysForGroup then "750" else "700"} /var/lib/acme/${k}/cert.pem | 34 | chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme.directory}/${k}/cert.pem |
35 | '') + | 35 | '') + |
36 | (lib.optionalString (builtins.elem "chain.pem" v.plugins) '' | 36 | (lib.optionalString (builtins.elem "chain.pem" v.plugins) '' |
37 | cp $workdir/ca.crt /var/lib/acme/${k}/chain.pem | 37 | cp $workdir/ca.crt ${config.security.acme.directory}/${k}/chain.pem |
38 | chown '${v.user}:${v.group}' /var/lib/acme/${k}/chain.pem | 38 | chown '${v.user}:${v.group}' ${config.security.acme.directory}/${k}/chain.pem |
39 | chmod ${if v.allowKeysForGroup then "750" else "700"} /var/lib/acme/${k}/chain.pem | 39 | chmod ${if v.allowKeysForGroup then "750" else "700"} ${config.security.acme.directory}/${k}/chain.pem |
40 | '') | 40 | '') |
41 | ; }) | 41 | ; }) |
42 | ) config.security.acme.certs // { | 42 | ) config.security.acme.certs // { |