Upgrade nixos

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / db / default.nix

diff --git a/modules/private/websites/tools/db/default.nix b/modules/private/websites/tools/db/default.nix
index 361e204d8efd9af97055c61be0e499ac8e532db9..fc8d98929d2a8350f471c194af59d9f1a36ed2e1 100644 (file)
--- a/modules/private/websites/tools/db/default.nix
+++ b/modules/private/websites/tools/db/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../../commons/adminer.nix {};
+    adminer = pkgs.callPackage ../../commons/adminer.nix { inherit config; };
 
     cfg = config.myServices.websites.tools.db;
 in {
@@ -9,13 +9,13 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    services.websites.tools.modules = adminer.apache.modules;
-    services.websites.tools.vhostConfs.db-1 = {
+    services.websites.env.tools.modules = adminer.apache.modules;
+    services.websites.env.tools.vhostConfs.db-1 = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["db-1.immae.eu" ];
       root        = null;
-      extraConfig = [ adminer.apache.vhostConf ];
+      extraConfig = [ (adminer.apache.vhostConf null) ];
     };
   };
 }