X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Faten%2Fdefault.nix;h=0b2ce6977a1965fa71ebf81f93b84b97e1243d16;hb=8a964143a4173fcbd6f398fffee727f228f952fa;hp=6f58d3cab8b5dbcb2523dea287c4aa4395502680;hpb=1b3154e40a568a296c74759d68827366b5f26da9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index 6f58d3c..0b2ce69 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -1,14 +1,15 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
-    aten = pkgs.callPackage ./aten.nix { inherit (mylibs) fetchedGitPrivate yarn2nixPackage; };
-    aten_dev  = aten {
-      config = myconfig.env.websites.aten.integration;
-    };
-    aten_prod = aten {
-      config = myconfig.env.websites.aten.production;
-    };
+  aten_dev = pkgs.callPackage ./aten.nix {
+    inherit (pkgs.private.webapps) aten;
+    config = myconfig.env.websites.aten.integration;
+  };
+  aten_prod = pkgs.callPackage ./aten.nix {
+    inherit (pkgs.private.webapps) aten;
+    config = myconfig.env.websites.aten.production;
+  };
 
-    cfg = config.services.myWebsites.Aten;
+  cfg = config.services.myWebsites.Aten;
 in {
   options.services.myWebsites.Aten = {
     production = {
@@ -19,20 +20,10 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
-      mySecrets.keys = aten_prod.keys;
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
-        {
-          name = "aten.pro";
-          conf = ./goaccess.conf;
-        }
-      ];
+      secrets.keys = aten_prod.keys;
+      services.webstats.sites = [ { name = "aten.pro"; } ];
 
       security.acme.certs."aten" = config.services.myCertificates.certConfig // {
         domain = "aten.pro";
@@ -47,7 +38,7 @@ in {
       system.activationScripts.aten_prod = aten_prod.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${aten_prod.webRoot} $out/webapps/${aten_prod.apache.webappName}
+        ln -s ${aten_prod.app.webRoot} $out/webapps/${aten_prod.apache.webappName}
         '';
       services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules;
       services.myWebsites.production.modules = aten_prod.apache.modules;
@@ -59,7 +50,7 @@ in {
       };
     })
     (lib.mkIf cfg.integration.enable {
-      mySecrets.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;
@@ -67,7 +58,7 @@ in {
       system.activationScripts.aten_dev = aten_dev.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${aten_dev.webRoot} $out/webapps/${aten_dev.apache.webappName}
+        ln -s ${aten_dev.app.webRoot} $out/webapps/${aten_dev.apache.webappName}
         '';
       services.myWebsites.integration.modules = aten_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.aten = {