X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fconnexionswing%2Fdefault.nix;h=20c5166d53144a7b8d53a725a35c008cc7de55cd;hb=4aac110f17f0528d90510eec00c9a8df60bcf04f;hp=ccbaa02bb27b92a796dc0a8473b13747dc03129c;hpb=8eded9ecb6220bb26599419a4aaea1743d3d187e;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index ccbaa02..20c5166 100644
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -1,14 +1,15 @@
-{ lib, pkgs, config, mylibs, myconfig, ... }:
+{ lib, pkgs, config,  myconfig, ... }:
 let
-    connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) fetchedGitPrivate; };
-    connexionswing_dev  = connexionswing {
-      config = myconfig.env.websites.connexionswing.integration;
-    };
-    connexionswing_prod = connexionswing {
-      config = myconfig.env.websites.connexionswing.production;
-    };
+  connexionswing_dev  = pkgs.callPackage ./connexionswing.nix {
+    inherit (pkgs.webapps) connexionswing;
+    config = myconfig.env.websites.connexionswing.integration;
+  };
+  connexionswing_prod = pkgs.callPackage ./connexionswing.nix {
+    inherit (pkgs.webapps) connexionswing;
+    config = myconfig.env.websites.connexionswing.production;
+  };
 
-    cfg = config.services.myWebsites.Connexionswing;
+  cfg = config.services.myWebsites.Connexionswing;
 in {
   options.services.myWebsites.Connexionswing = {
     production = {
@@ -19,29 +20,10 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      deployment.keys = connexionswing_prod.keys;
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
-        {
-          name = "connexionswing.com";
-          conf = ./goaccess.conf;
-        }
-      ];
-
-      security.acme.certs."connexionswing" = config.services.myCertificates.certConfig // {
-        domain = "connexionswing.com";
-        extraDomains = {
-          "www.connexionswing.com" = null;
-          "sandetludo.com" = null;
-          "www.sandetludo.com" = null;
-        };
-      };
+      secrets.keys = connexionswing_prod.keys;
+      services.webstats.sites = [ { name = "connexionswing.com"; } ];
 
       services.myPhpfpm.preStart.connexionswing_prod = connexionswing_prod.phpFpm.preStart;
       services.myPhpfpm.serviceDependencies.connexionswing_prod = connexionswing_prod.phpFpm.serviceDeps;
@@ -50,20 +32,19 @@ in {
       system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${connexionswing_prod.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
+        ln -s ${connexionswing_prod.app.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
         '';
-      services.myWebsites.production.modules = connexionswing_prod.apache.modules;
-      services.myWebsites.production.vhostConfs.connexionswing = {
-        certName    = "connexionswing";
-        hosts       = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
-        root        = connexionswing_prod.apache.root;
-        extraConfig = [ connexionswing_prod.apache.vhostConf ];
+      services.websites.production.modules = connexionswing_prod.apache.modules;
+      services.websites.production.vhostConfs.connexionswing = {
+        certName     = "connexionswing";
+        certMainHost = "connexionswing.com";
+        hosts        = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
+        root         = connexionswing_prod.apache.root;
+        extraConfig  = [ connexionswing_prod.apache.vhostConf ];
       };
     })
     (lib.mkIf cfg.integration.enable {
-      deployment.keys = connexionswing_dev.keys;
-      security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
-      security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
+      secrets.keys = connexionswing_dev.keys;
       services.myPhpfpm.preStart.connexionswing_dev = connexionswing_dev.phpFpm.preStart;
       services.myPhpfpm.serviceDependencies.connexionswing_dev = connexionswing_dev.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
@@ -71,11 +52,12 @@ in {
       system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${connexionswing_dev.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
+        ln -s ${connexionswing_dev.app.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
         '';
-      services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
-      services.myWebsites.integration.vhostConfs.connexionswing = {
+      services.websites.integration.modules = connexionswing_dev.apache.modules;
+      services.websites.integration.vhostConfs.connexionswing = {
         certName    = "eldiron";
+        addToCerts  = true;
         hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
         root        = connexionswing_dev.apache.root;
         extraConfig = [ connexionswing_dev.apache.vhostConf ];