X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Fdefault.nix;h=eb02174c6727e47d3d4caa1f197d1fccf8495088;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=381476c0a7e0a4876795d5530b227de3ed8de4a5;hpb=c890321db12036be69ebbece202984874b1e5a57;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index 381476c..eb02174 100644
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -1,9 +1,9 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
 
   tellesflorian_dev  = pkgs.callPackage ./tellesflorian.nix {
-    inherit (pkgs.private.webapps) tellesflorian;
+    inherit (pkgs.webapps) tellesflorian;
     config = myconfig.env.websites.tellesflorian.integration;
   };
 
@@ -26,8 +26,8 @@ in {
       mkdir -p $out/webapps
       ln -s ${tellesflorian_dev.app.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
       '';
-    services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
-    services.myWebsites.integration.vhostConfs.tellesflorian = {
+    services.websites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
+    services.websites.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
       hosts       = ["app.tellesflorian.com" ];
       root        = tellesflorian_dev.apache.root;