X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fpiedsjaloux%2Fdefault.nix;h=b2bd2fd4295b7b4623a072ca60d18dab44d90b90;hb=d42bbbe6f510fce233ecb66d44d205761390b56e;hp=1c6864c861ded6deb3b95133376bbfe7069ec05f;hpb=6e23a06b9d5e0bdb21c737285e36dbe76b2d3ac1;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix index 1c6864c..b2bd2fd 100644 --- a/nixops/modules/websites/piedsjaloux/default.nix +++ b/nixops/modules/websites/piedsjaloux/default.nix @@ -25,7 +25,7 @@ in { config = lib.mkMerge [ (lib.mkIf cfg.production.enable { - deployment.keys = piedsjaloux_prod.keys; + mySecrets.keys = piedsjaloux_prod.keys; services.myWebsites.commons.stats.enable = true; services.myWebsites.commons.stats.sites = [ { @@ -41,6 +41,8 @@ in { }; }; + services.myPhpfpm.preStart.piedsjaloux_prod = piedsjaloux_prod.phpFpm.preStart; + services.myPhpfpm.serviceDependencies.piedsjaloux_prod = piedsjaloux_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.piedsjaloux_prod = piedsjaloux_prod.phpFpm.pool; system.activationScripts.piedsjaloux_prod = piedsjaloux_prod.activationScript; system.extraSystemBuilderCmds = '' @@ -56,8 +58,10 @@ in { }; }) (lib.mkIf cfg.integration.enable { - deployment.keys = piedsjaloux_dev.keys; + mySecrets.keys = piedsjaloux_dev.keys; security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; + services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux_dev.phpFpm.preStart; + services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.piedsjaloux_dev = piedsjaloux_dev.phpFpm.pool; system.activationScripts.piedsjaloux_dev = piedsjaloux_dev.activationScript; system.extraSystemBuilderCmds = ''