Move websites to their own modules: php config and scripts

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 5dafe6e60b78a70482ac51605a4653299359763f..7189c3912c587b8e07501207a6c8d97f03ef97fb 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -133,16 +133,6 @@
         '';
       poolConfigs = {
         adminer = mypkgs.adminer.phpFpm.pool;
-        connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool;
-        connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool;
-        ludivinecassal_dev = mypkgs.ludivinecassal_dev.phpFpm.pool;
-        ludivinecassal_prod = mypkgs.ludivinecassal_prod.phpFpm.pool;
-        piedsjaloux_dev = mypkgs.piedsjaloux_dev.phpFpm.pool;
-        piedsjaloux_prod = mypkgs.piedsjaloux_prod.phpFpm.pool;
-        chloe_dev = mypkgs.chloe_dev.phpFpm.pool;
-        chloe_prod = mypkgs.chloe_prod.phpFpm.pool;
-        aten_dev = mypkgs.aten_dev.phpFpm.pool;
-        aten_prod = mypkgs.aten_prod.phpFpm.pool;
         nextcloud = mypkgs.nextcloud.phpFpm.pool;
         mantisbt = mypkgs.mantisbt.phpFpm.pool;
         ttrss = mypkgs.ttrss.phpFpm.pool;
@@ -152,16 +142,6 @@
     };
 
     system.activationScripts = {
-      connexionswing_dev  = mypkgs.connexionswing_dev.activationScript;
-      connexionswing_prod = mypkgs.connexionswing_prod.activationScript;
-      ludivinecassal_dev  = mypkgs.ludivinecassal_dev.activationScript;
-      ludivinecassal_prod = mypkgs.ludivinecassal_prod.activationScript;
-      piedsjaloux_dev     = mypkgs.piedsjaloux_dev.activationScript;
-      piedsjaloux_prod    = mypkgs.piedsjaloux_prod.activationScript;
-      chloe_dev  = mypkgs.chloe_dev.activationScript;
-      chloe_prod = mypkgs.chloe_prod.activationScript;
-      aten_dev  = mypkgs.aten_dev.activationScript;
-      aten_prod = mypkgs.aten_prod.activationScript;
       nextcloud = mypkgs.nextcloud.activationScript;
       ttrss = mypkgs.ttrss.activationScript;
       roundcubemail = mypkgs.roundcubemail.activationScript;

diff --git a/virtual/modules/websites/aten.nix b/virtual/modules/websites/aten.nix
index 75672891179bf19b0a14f1286352bef70a591256..88a985704a2ace5700ea802d1dc9d069e47f78a3 100644 (file)
--- a/virtual/modules/websites/aten.nix
+++ b/virtual/modules/websites/aten.nix
@@ -1,5 +1,9 @@
 { lib, pkgs, config, mylibs, ... }:
 let
+    aten = pkgs.callPackage ../../packages/aten.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    aten_dev  = aten { environment = "dev"; };
+    aten_prod = aten { environment = "prod"; };
+
     cfg = config.services.myWebsites.Aten;
 in {
   options.services.myWebsites.Aten = {
@@ -19,9 +23,14 @@ in {
           "www.aten.pro" = null;
         };
       };
+
+      services.phpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool;
+      system.activationScripts.aten_prod = aten_prod.activationScript;
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null;
+      services.phpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool;
+      system.activationScripts.aten_dev = aten_dev.activationScript;
     })
   ];
 }

diff --git a/virtual/modules/websites/chloe.nix b/virtual/modules/websites/chloe.nix
index 2c0c65ddb611c9ac15fdeb296a3fc6f2641224f6..9b5c5cab0d4b014ec5aa1420fadc994ce9f86769 100644 (file)
--- a/virtual/modules/websites/chloe.nix
+++ b/virtual/modules/websites/chloe.nix
@@ -1,5 +1,9 @@
 { lib, pkgs, config, mylibs, ... }:
 let
+    chloe = pkgs.callPackage ../../packages/chloe.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    chloe_dev = chloe { environment = "dev"; };
+    chloe_prod = chloe { environment = "prod"; };
+
     cfg = config.services.myWebsites.Chloe;
 in {
   options.services.myWebsites.Chloe = {
@@ -19,9 +23,14 @@ in {
           "www.osteopathe-cc.fr" = null;
         };
       };
+
+      services.phpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool;
+      system.activationScripts.chloe_prod = chloe_prod.activationScript;
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null;
+      services.phpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool;
+      system.activationScripts.chloe_dev = chloe_dev.activationScript;
     })
   ];
 }

diff --git a/virtual/modules/websites/connexionswing.nix b/virtual/modules/websites/connexionswing.nix
index ed6799f32f7de6c9df8909fbcb1d6e4dc6fcfa83..e4b9c0e81a8d90ae402280db2f5b9b4361eb3d57 100644 (file)
--- a/virtual/modules/websites/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing.nix
@@ -1,5 +1,9 @@
 { lib, pkgs, config, mylibs, ... }:
 let
+    connexionswing = pkgs.callPackage ../../packages/connexionswing.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    connexionswing_dev  = connexionswing { environment = "dev"; };
+    connexionswing_prod = connexionswing { environment = "prod"; };
+
     cfg = config.services.myWebsites.Connexionswing;
 in {
   options.services.myWebsites.Connexionswing = {
@@ -21,10 +25,15 @@ in {
           "www.sandetludo.com" = null;
         };
       };
+
+      services.phpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
+      system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
       security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
+      services.phpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
+      system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
     })
   ];
 }

diff --git a/virtual/modules/websites/ludivine.nix b/virtual/modules/websites/ludivine.nix
index 5729c09c62723e51edb92cee3dd8ae0c00c1607a..9d6b693d23268e6be35c4a8153836c1d66354d72 100644 (file)
--- a/virtual/modules/websites/ludivine.nix
+++ b/virtual/modules/websites/ludivine.nix
@@ -1,5 +1,9 @@
 { lib, pkgs, config, mylibs, ... }:
 let
+    ludivinecassal = pkgs.callPackage ../../packages/ludivinecassal.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    ludivinecassal_dev  = ludivinecassal { environment = "dev"; };
+    ludivinecassal_prod = ludivinecassal { environment = "prod"; };
+
     cfg = config.services.myWebsites.Ludivine;
 in {
   options.services.myWebsites.Ludivine = {
@@ -19,9 +23,15 @@ in {
           "www.ludivinecassal.com" = null;
         };
       };
+
+      services.phpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool;
+      system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript;
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null;
+
+      services.phpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool;
+      system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript;
     })
   ];
 }

diff --git a/virtual/modules/websites/piedsjaloux.nix b/virtual/modules/websites/piedsjaloux.nix
index 849df636a14b3f39436dfafd511582c4573729f9..f2b17adc5d21efaea1aed10d6a803ccaa4932d96 100644 (file)
--- a/virtual/modules/websites/piedsjaloux.nix
+++ b/virtual/modules/websites/piedsjaloux.nix
@@ -1,5 +1,9 @@
 { lib, pkgs, config, mylibs, ... }:
 let
+    piedsjaloux = pkgs.callPackage ../../packages/piedsjaloux.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    piedsjaloux_dev  = piedsjaloux { environment = "dev"; };
+    piedsjaloux_prod = piedsjaloux { environment = "prod"; };
+
     cfg = config.services.myWebsites.PiedsJaloux;
 in {
   options.services.myWebsites.PiedsJaloux = {
@@ -19,9 +23,14 @@ in {
           "www.piedsjaloux.fr" = null;
         };
       };
+
+      services.phpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool;
+      system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript;
     })
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null;
+      services.phpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool;
+      system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript;
     })
   ];
 }