From 86f6924f021869c1fd8e4e2a7930d50f04f921df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 10 Jan 2019 00:58:47 +0100 Subject: [PATCH] Move websites to their own modules: php config and scripts --- virtual/eldiron.nix | 20 -------------------- virtual/modules/websites/aten.nix | 9 +++++++++ virtual/modules/websites/chloe.nix | 9 +++++++++ virtual/modules/websites/connexionswing.nix | 9 +++++++++ virtual/modules/websites/ludivine.nix | 10 ++++++++++ virtual/modules/websites/piedsjaloux.nix | 9 +++++++++ 6 files changed, 46 insertions(+), 20 deletions(-) diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 5dafe6e..7189c39 100644 --- 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 7567289..88a9857 100644 --- 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 2c0c65d..9b5c5ca 100644 --- 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 ed6799f..e4b9c0e 100644 --- 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 5729c09..9d6b693 100644 --- 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 849df63..f2b17ad 100644 --- 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; }) ]; } -- 2.41.0