X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fconnexionswing%2Fdefault.nix;h=b19af7e01801d1b618648c3aad78aecdc2d3f52e;hb=8f904d0d982684e8e66dfc5d9123712eb96bf16e;hp=773c8de49dfded9a93ce1b2aecd9fef9ba05395c;hpb=9eae2b47b7b315b05a0e010f3003bd875685e260;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index 773c8de..b19af7e 100644
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -1,14 +1,15 @@
-{ lib, pkgs, config, mylibs, myconfig, ... }:
+{ lib, pkgs, config,  myconfig, ... }:
 let
-    connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) fetchedGitPrivate; };
-    connexionswing_dev  = connexionswing {
-      config = myconfig.env.websites.connexionswing.integration;
-    };
-    connexionswing_prod = connexionswing {
-      config = myconfig.env.websites.connexionswing.production;
-    };
+  connexionswing_dev  = pkgs.callPackage ./connexionswing.nix {
+    inherit (pkgs.webapps) connexionswing;
+    config = myconfig.env.websites.connexionswing.integration;
+  };
+  connexionswing_prod = pkgs.callPackage ./connexionswing.nix {
+    inherit (pkgs.webapps) connexionswing;
+    config = myconfig.env.websites.connexionswing.production;
+  };
 
-    cfg = config.services.myWebsites.Connexionswing;
+  cfg = config.services.myWebsites.Connexionswing;
 in {
   options.services.myWebsites.Connexionswing = {
     production = {
@@ -40,7 +41,7 @@ in {
       system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${connexionswing_prod.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
+        ln -s ${connexionswing_prod.app.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
         '';
       services.myWebsites.production.modules = connexionswing_prod.apache.modules;
       services.myWebsites.production.vhostConfs.connexionswing = {
@@ -61,7 +62,7 @@ in {
       system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${connexionswing_dev.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
+        ln -s ${connexionswing_dev.app.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
         '';
       services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.connexionswing = {