X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fcertificates.nix;h=c68bbee5f585d4bdf69376a687180c9cf9e92e78;hb=3ffa15baf832f5b94cfd8d1b978eaa42f4102e07;hp=f057200263416c9aeaa33d20c80b20c4f19e4098;hpb=981fa80354fd6f00f49446777c38f77bd8a65f65;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/certificates.nix b/modules/private/certificates.nix
index f057200..c68bbee 100644
--- a/modules/private/certificates.nix
+++ b/modules/private/certificates.nix
@@ -4,7 +4,7 @@
     enable = lib.mkEnableOption "enable certificates";
     certConfig = lib.mkOption {
       default = {
-        webroot = "/var/lib/acme/acme-challenge";
+        webroot = "/var/lib/acme/acme-challenges";
         email = "ismael@bouya.org";
         postRun = builtins.concatStringsSep "\n" [
           (lib.optionalString config.services.httpd.Prod.enable "systemctl reload httpdProd.service")
@@ -12,7 +12,6 @@
           (lib.optionalString config.services.httpd.Inte.enable "systemctl reload httpdInte.service")
           (lib.optionalString config.services.nginx.enable "systemctl reload nginx.service")
         ];
-        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" "account_reg.json"];
       };
       description = "Default configuration for certificates";
     };
@@ -20,38 +19,59 @@
 
   config = lib.mkIf config.myServices.certificates.enable {
     services.duplyBackup.profiles.system.excludeFile = ''
-      + /var/lib/acme/acme-challenge
+      + /var/lib/acme/acme-challenges
       '';
     services.nginx = {
       recommendedTlsSettings = true;
-      virtualHosts = { "${config.hostEnv.fqdn}" = { useACMEHost = name; forceSSL = true; }; };
+      virtualHosts = {
+        "${config.hostEnv.fqdn}" = {
+          acmeRoot = config.security.acme.certs."${name}".webroot;
+          useACMEHost = name;
+          forceSSL = true;
+        };
+      };
     };
     services.websites.certs = config.myServices.certificates.certConfig;
     myServices.databasesCerts = config.myServices.certificates.certConfig;
     myServices.ircCerts = config.myServices.certificates.certConfig;
 
-    security.acme2.preliminarySelfsigned = true;
+    security.acme.acceptTerms = 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
-        '') +
-        (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
-        '')
-      ; })
-    ) config.security.acme2.certs // {
+      lib.attrsets.nameValuePair "acme-selfsigned-${k}" { script = lib.mkBefore ''
+        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
+
+        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.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