X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Faten%2Fdefault.nix;h=f6efe01acdfe5b31e078ec5b9995c2f806dffc66;hb=1a7188052f235fb632700478fad0108e4306107d;hp=58228ed08a0429368f38f65e0e1ccdea572336a0;hpb=a0c845b436329624ad33432a701658dc1b52cca6;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix index 58228ed..f6efe01 100644 --- a/nixops/modules/websites/aten/default.nix +++ b/nixops/modules/websites/aten/default.nix @@ -25,7 +25,7 @@ in { config = lib.mkMerge [ (lib.mkIf cfg.production.enable { - deployment.keys = aten_prod.keys; + secrets.keys = aten_prod.keys; services.myWebsites.commons.stats.enable = true; services.myWebsites.commons.stats.sites = [ { @@ -41,6 +41,7 @@ in { }; }; + services.myPhpfpm.preStart.aten_prod = aten_prod.phpFpm.preStart; services.myPhpfpm.serviceDependencies.aten_prod = aten_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.aten_prod = aten_prod.phpFpm.pool; system.activationScripts.aten_prod = aten_prod.activationScript; @@ -58,8 +59,9 @@ in { }; }) (lib.mkIf cfg.integration.enable { - deployment.keys = aten_dev.keys; + secrets.keys = aten_dev.keys; security.acme.certs."eldiron".extraDomains."dev.aten.pro" = null; + services.myPhpfpm.preStart.aten_dev = aten_dev.phpFpm.preStart; services.myPhpfpm.serviceDependencies.aten_dev = aten_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.aten_dev = aten_dev.phpFpm.pool; system.activationScripts.aten_dev = aten_dev.activationScript;