X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fchloe%2Fdefault.nix;h=ba72d92d799b4ed0b5deb17e9c66263ebc7c410e;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=ea984aef0b8cbaf2fa2509f8cfa87ae6d5ac9916;hpb=8a964143a4173fcbd6f398fffee727f228f952fa;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/chloe/default.nix b/nixops/modules/websites/chloe/default.nix
index ea984ae..ba72d92 100644
--- a/nixops/modules/websites/chloe/default.nix
+++ b/nixops/modules/websites/chloe/default.nix
@@ -1,11 +1,11 @@
 { lib, pkgs, config, myconfig,  ... }:
 let
   chloe_dev  = pkgs.callPackage ./chloe.nix {
-    inherit (pkgs.private.webapps) chloe;
+    inherit (pkgs.webapps) chloe;
     config = myconfig.env.websites.chloe.integration;
   };
   chloe_prod = pkgs.callPackage ./chloe.nix {
-    inherit (pkgs.private.webapps) chloe;
+    inherit (pkgs.webapps) chloe;
     config = myconfig.env.websites.chloe.production;
   };
 
@@ -42,8 +42,8 @@ in {
         mkdir -p $out/webapps
         ln -s ${chloe_prod.app.webRoot} $out/webapps/${chloe_prod.apache.webappName}
         '';
-      services.myWebsites.production.modules = chloe_prod.apache.modules;
-      services.myWebsites.production.vhostConfs.chloe = {
+      services.websites.production.modules = chloe_prod.apache.modules;
+      services.websites.production.vhostConfs.chloe = {
         certName    = "chloe";
         hosts       = ["osteopathe-cc.fr" "www.osteopathe-cc.fr" ];
         root        = chloe_prod.apache.root;
@@ -63,8 +63,8 @@ in {
         mkdir -p $out/webapps
         ln -s ${chloe_dev.app.webRoot} $out/webapps/${chloe_dev.apache.webappName}
         '';
-      services.myWebsites.integration.modules = chloe_dev.apache.modules;
-      services.myWebsites.integration.vhostConfs.chloe = {
+      services.websites.integration.modules = chloe_dev.apache.modules;
+      services.websites.integration.vhostConfs.chloe = {
         certName    = "eldiron";
         hosts       = ["chloe.immae.eu" ];
         root        = chloe_dev.apache.root;