Refactor a bit httpd/webapps configuration:

[perso/Immae/Config/Nix.git] / nixops / modules / websites / connexionswing / default.nix

diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index f176762d3e308b751124d563fa376eb676c50f93..b19af7e01801d1b618648c3aad78aecdc2d3f52e 100644 (file)
--- 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,19 +20,10 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
-        {
-          name = "connexionswing.com";
-          conf = ./goaccess.conf;
-        }
-      ];
+      secrets.keys = connexionswing_prod.keys;
+      services.webstats.sites = [ { name = "connexionswing.com"; } ];
 
       security.acme.certs."connexionswing" = config.services.myCertificates.certConfig // {
         domain = "connexionswing.com";
@@ -42,30 +34,35 @@ in {
         };
       };
 
+      services.myPhpfpm.preStart.connexionswing_prod = connexionswing_prod.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.connexionswing_prod = connexionswing_prod.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
       services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig;
       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.webRoot;
+        root        = connexionswing_prod.apache.root;
         extraConfig = [ connexionswing_prod.apache.vhostConf ];
       };
     })
     (lib.mkIf cfg.integration.enable {
+      secrets.keys = connexionswing_dev.keys;
       security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
       security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
+      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;
       services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig;
       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 = {