Add certificate creation and handling to websites

1 files changed, 6 insertions, 12 deletions

diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix
index 6ffb19c..a5ee24f 100644
--- a/nixops/modules/websites/piedsjaloux/default.nix
+++ b/nixops/modules/websites/piedsjaloux/default.nix
@@ -25,13 +25,6 @@ in {
       secrets.keys = piedsjaloux_prod.keys;
       services.webstats.sites = [ { name = "piedsjaloux.fr"; } ];
 
-      security.acme.certs."piedsjaloux" = config.services.myCertificates.certConfig // {
-        domain = "piedsjaloux.fr";
-        extraDomains = {
-          "www.piedsjaloux.fr" = null;
-        };
-      };
-
       services.myPhpfpm.preStart.piedsjaloux_prod = piedsjaloux_prod.phpFpm.preStart;
       services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
@@ -42,15 +35,15 @@ in {
         '';
       services.websites.production.modules = piedsjaloux_prod.apache.modules;
       services.websites.production.vhostConfs.piedsjaloux = {
-        certName    = "piedsjaloux";
-        hosts       = [ "piedsjaloux.fr" "www.piedsjaloux.fr" ];
-        root        = piedsjaloux_prod.apache.root;
-        extraConfig = [ piedsjaloux_prod.apache.vhostConf ];
+        certName     = "piedsjaloux";
+        certMainHost = "piedsjaloux.fr";
+        hosts        = [ "piedsjaloux.fr" "www.piedsjaloux.fr" ];
+        root         = piedsjaloux_prod.apache.root;
+        extraConfig  = [ piedsjaloux_prod.apache.vhostConf ];
       };
     })
     (lib.mkIf cfg.integration.enable {
       secrets.keys = piedsjaloux_dev.keys;
-      security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
       services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux_dev.phpFpm.preStart;
       services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
@@ -62,6 +55,7 @@ in {
       services.websites.integration.modules = piedsjaloux_dev.apache.modules;
       services.websites.integration.vhostConfs.piedsjaloux = {
         certName    = "eldiron";
+        addToCerts  = true;
         hosts       = [ "piedsjaloux.immae.eu" ];
         root        = piedsjaloux_dev.apache.root;
         extraConfig = [ piedsjaloux_dev.apache.vhostConf ];