X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Faten%2Fdefault.nix;h=f6efe01acdfe5b31e078ec5b9995c2f806dffc66;hb=1a7188052f235fb632700478fad0108e4306107d;hp=f586ed5a48bb7d66844679706cea46d0470dbabb;hpb=e5073addbe397afd596613af469f3308a07c1801;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index f586ed5..f6efe01 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    aten = pkgs.callPackage ./aten.nix { inherit (mylibs) fetchedGitPrivate; };
+    aten = pkgs.callPackage ./aten.nix { inherit (mylibs) fetchedGitPrivate yarn2nixPackage; };
     aten_dev  = aten {
       config = myconfig.env.websites.aten.integration;
     };
@@ -25,6 +25,7 @@ in {
 
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
+      secrets.keys = aten_prod.keys;
       services.myWebsites.commons.stats.enable = true;
       services.myWebsites.commons.stats.sites = [
         {
@@ -40,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 = ''
@@ -51,12 +54,15 @@ in {
       services.myWebsites.production.vhostConfs.aten = {
         certName    = "aten";
         hosts       = [ "aten.pro" "www.aten.pro" ];
-        root        = aten_prod.webRoot;
+        root        = aten_prod.apache.root;
         extraConfig = [ aten_prod.apache.vhostConf ];
       };
     })
     (lib.mkIf cfg.integration.enable {
+      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 = ''