Start moving websites configuration to modules

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

diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix
index 69c572036c6bd3c195479a3739556f7abf8e495c..dfeff0ad6542646ed8860a959a9c68e712dffe69 100644 (file)
--- a/nixops/modules/websites/ludivine/default.nix
+++ b/nixops/modules/websites/ludivine/default.nix
@@ -1,11 +1,11 @@
 { lib, pkgs, config, myconfig,  ... }:
 let
     ludivinecassal_dev  = pkgs.callPackage ./ludivinecassal.nix {
-      inherit (pkgs.private.webapps) ludivinecassal;
+      inherit (pkgs.webapps) ludivinecassal;
       config = myconfig.env.websites.ludivinecassal.integration;
     };
     ludivinecassal_prod = pkgs.callPackage ./ludivinecassal.nix {
-      inherit (pkgs.private.webapps) ludivinecassal;
+      inherit (pkgs.webapps) ludivinecassal;
       config = myconfig.env.websites.ludivinecassal.production;
     };
 
@@ -40,8 +40,8 @@ in {
         mkdir -p $out/webapps
         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;
@@ -60,9 +60,8 @@ in {
         mkdir -p $out/webapps
         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;