Move secrets module outside of nixops

[perso/Immae/Config/Nix.git] / nixops / modules / websites / aten / default.nix

diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index 776a02e7e2c5caa1e26df5455af516c0ba0522b5..f6efe01acdfe5b31e078ec5b9995c2f806dffc66 100644 (file)
--- 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,8 @@ 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;
       system.extraSystemBuilderCmds = ''
@@ -57,8 +59,10 @@ 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;
       system.extraSystemBuilderCmds = ''