Start moving websites configuration to modules

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

diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index bcbef51a818a99d795674f8d3e99c5351714416b..dfeff0ad6542646ed8860a959a9c68e712dffe69 100644 (file)
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -1,10 +1,11 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
-    ludivinecassal = pkgs.callPackage ./ludivinecassal.nix { inherit (mylibs) fetchedGitPrivate; };
-    ludivinecassal_dev  = ludivinecassal {
+    ludivinecassal_dev  = pkgs.callPackage ./ludivinecassal.nix {
+      inherit (pkgs.webapps) ludivinecassal;
       config = myconfig.env.websites.ludivinecassal.integration;
     };
-    ludivinecassal_prod = ludivinecassal {
+    ludivinecassal_prod = pkgs.callPackage ./ludivinecassal.nix {
+      inherit (pkgs.webapps) ludivinecassal;
       config = myconfig.env.websites.ludivinecassal.production;
     };
 
@@ -21,13 +22,8 @@ in {
 
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
-        {
-          name = "ludivinecassal.com";
-          conf = ./goaccess.conf;
-        }
-      ];
+      secrets.keys = ludivinecassal_prod.keys;
+      services.webstats.sites = [ { name = "ludivinecassal.com"; } ];
 
       security.acme.certs."ludivinecassal" = config.services.myCertificates.certConfig // {
         domain = "ludivinecassal.com";
@@ -36,32 +32,36 @@ in {
         };
       };
 
+      services.myPhpfpm.preStart.ludivinecassal_prod = ludivinecassal_prod.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal_prod.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
       system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${ludivinecassal_prod.webRoot} $out/webapps/${ludivinecassal_prod.apache.webappName}
+        ln -s ${ludivinecassal_prod.app.webRoot} $out/webapps/${ludivinecassal_prod.apache.webappName}
         '';
-      services.myWebsites.production.modules = ludivinecassal_prod.apache.modules;
-      services.myWebsites.production.vhostConfs.ludivine = {
+      services.websites.production.modules = ludivinecassal_prod.apache.modules;
+      services.websites.production.vhostConfs.ludivine = {
         certName    = "ludivinecassal";
         hosts       = ["ludivinecassal.com" "www.ludivinecassal.com" ];
-        root        = ludivinecassal_prod.webRoot;
+        root        = ludivinecassal_prod.apache.root;
         extraConfig = [ ludivinecassal_prod.apache.vhostConf ];
       };
     })
     (lib.mkIf cfg.integration.enable {
+      secrets.keys = ludivinecassal_dev.keys;
       security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null;
 
+      services.myPhpfpm.preStart.ludivinecassal_dev = ludivinecassal_dev.phpFpm.preStart;
+      services.myPhpfpm.serviceDependencies.ludivinecassal_dev = ludivinecassal_dev.phpFpm.serviceDeps;
       services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool;
       system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${ludivinecassal_dev.webRoot} $out/webapps/${ludivinecassal_dev.apache.webappName}
+        ln -s ${ludivinecassal_dev.app.webRoot} $out/webapps/${ludivinecassal_dev.apache.webappName}
         '';
-      services.myWebsites.apacheConfig.ludivinecassal_dev.modules = ludivinecassal_dev.apache.modules;
-      services.myWebsites.integration.modules = ludivinecassal_dev.apache.modules;
-      services.myWebsites.integration.vhostConfs.ludivine = {
+      services.websites.integration.modules = ludivinecassal_dev.apache.modules;
+      services.websites.integration.vhostConfs.ludivine = {
         certName    = "eldiron";
         hosts       = [ "ludivine.immae.eu" ];
         root        = ludivinecassal_dev.apache.root;