X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fconnexionswing%2Fdefault.nix;h=2966cb8afd4f0d286ab1450e7274019f563695e7;hb=1a7188052f235fb632700478fad0108e4306107d;hp=752382f855e9d2c20ca15487de7518dd4e187f41;hpb=a754e9dbf5d6c35398f3c4ec52c3daf5f8ed2dd3;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix index 752382f..2966cb8 100644 --- a/nixops/modules/websites/connexionswing/default.nix +++ b/nixops/modules/websites/connexionswing/default.nix @@ -25,7 +25,7 @@ in { config = lib.mkMerge [ (lib.mkIf cfg.production.enable { - deployment.keys = connexionswing_prod.keys; + secrets.keys = connexionswing_prod.keys; services.myWebsites.commons.stats.enable = true; services.myWebsites.commons.stats.sites = [ { @@ -43,6 +43,8 @@ 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; @@ -59,9 +61,11 @@ in { }; }) (lib.mkIf cfg.integration.enable { - deployment.keys = connexionswing_dev.keys; + 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;