X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fproduction.nix;h=16c6022888357c61f8ce4e9936c2aa148c9b4bd5;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=44a262ec83dfdcac53b83f5c035a68dc6c2ee817;hpb=29f8cb850d74b456d6481a456311bbf5361d328c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix
index 44a262e..16c6022 100644
--- a/modules/private/websites/florian/production.nix
+++ b/modules/private/websites/florian/production.nix
@@ -1,9 +1,9 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../commons/adminer.nix {};
+    adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
     cfg = config.myServices.websites.florian.production;
     varDir = "/var/lib/ftp/florian";
-    env = myconfig.env.websites.florian;
+    env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.production.enable = lib.mkEnableOption "enable Florian's website production";
 
@@ -17,7 +17,7 @@ in {
       hosts        = [ "tellesflorian.com" "www.tellesflorian.com" ];
       root         = "${varDir}/tellesflorian.com";
       extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
         ''
         ServerAdmin ${env.server_admin}