X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fludivine%2Fdefault.nix;h=dfeff0ad6542646ed8860a959a9c68e712dffe69;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=2fcd94a424fd1395cb0ad5c034533681b74455e5;hpb=9eae2b47b7b315b05a0e010f3003bd875685e260;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index 2fcd94a..dfeff0a 100644
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -1,10 +1,11 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
-    ludivinecassal = pkgs.callPackage ./ludivinecassal.nix { inherit (mylibs) fetchedGitPrivate; };
-    ludivinecassal_dev  = ludivinecassal {
+    ludivinecassal_dev  = pkgs.callPackage ./ludivinecassal.nix {
+      inherit (pkgs.webapps) ludivinecassal;
       config = myconfig.env.websites.ludivinecassal.integration;
     };
-    ludivinecassal_prod = ludivinecassal {
+    ludivinecassal_prod = pkgs.callPackage ./ludivinecassal.nix {
+      inherit (pkgs.webapps) ludivinecassal;
       config = myconfig.env.websites.ludivinecassal.production;
     };
 
@@ -37,10 +38,10 @@ in {
       system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${ludivinecassal_prod.webRoot} $out/webapps/${ludivinecassal_prod.apache.webappName}
+        ln -s ${ludivinecassal_prod.app.webRoot} $out/webapps/${ludivinecassal_prod.apache.webappName}
         '';
-      services.myWebsites.production.modules = ludivinecassal_prod.apache.modules;
-      services.myWebsites.production.vhostConfs.ludivine = {
+      services.websites.production.modules = ludivinecassal_prod.apache.modules;
+      services.websites.production.vhostConfs.ludivine = {
         certName    = "ludivinecassal";
         hosts       = ["ludivinecassal.com" "www.ludivinecassal.com" ];
         root        = ludivinecassal_prod.apache.root;
@@ -57,11 +58,10 @@ in {
       system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript;
       system.extraSystemBuilderCmds = ''
         mkdir -p $out/webapps
-        ln -s ${ludivinecassal_dev.webRoot} $out/webapps/${ludivinecassal_dev.apache.webappName}
+        ln -s ${ludivinecassal_dev.app.webRoot} $out/webapps/${ludivinecassal_dev.apache.webappName}
         '';
-      services.myWebsites.apacheConfig.ludivinecassal_dev.modules = ludivinecassal_dev.apache.modules;
-      services.myWebsites.integration.modules = ludivinecassal_dev.apache.modules;
-      services.myWebsites.integration.vhostConfs.ludivine = {
+      services.websites.integration.modules = ludivinecassal_dev.apache.modules;
+      services.websites.integration.vhostConfs.ludivine = {
         certName    = "eldiron";
         hosts       = [ "ludivine.immae.eu" ];
         root        = ludivinecassal_dev.apache.root;