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

diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index 9bf4a48..eb02174 100644
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -1,13 +1,13 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
-    adminer = pkgs.callPackage ../commons/adminer.nix {};
+  adminer = pkgs.callPackage ../commons/adminer.nix {};
 
-    tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) fetchedGitPrivate; };
-    tellesflorian_dev  = tellesflorian {
-      config = myconfig.env.websites.tellesflorian.integration;
-    };
+  tellesflorian_dev  = pkgs.callPackage ./tellesflorian.nix {
+    inherit (pkgs.webapps) tellesflorian;
+    config = myconfig.env.websites.tellesflorian.integration;
+  };
 
-    cfg = config.services.myWebsites.TellesFlorian;
+  cfg = config.services.myWebsites.TellesFlorian;
 in {
   options.services.myWebsites.TellesFlorian = {
     integration = {
@@ -16,7 +16,7 @@ in {
   };
 
   config = lib.mkIf cfg.integration.enable {
-    deployment.keys = tellesflorian_dev.keys;
+    secrets.keys = tellesflorian_dev.keys;
     security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null;
     services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian_dev.phpFpm.preStart;
     services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps;
@@ -24,10 +24,10 @@ in {
     system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
-      ln -s ${tellesflorian_dev.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
+      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;