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

diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index e444e69..4ee160a 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.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.integration;
     varDir = "/var/lib/ftp/florian";
-    env = myconfig.env.websites.florian;
+    env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
 
@@ -12,12 +12,12 @@ in {
 
     services.websites.env.integration.modules = adminer.apache.modules;
     services.websites.env.integration.vhostConfs.florian = {
-      certName    = "eldiron";
+      certName    = "integration";
       addToCerts  = true;
       hosts       = [ "florian.immae.eu" ];
       root        = "${varDir}/florian.immae.eu";
       extraConfig = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
         ''
         ServerAdmin ${env.server_admin}