Upgrade nixos

[perso/Immae/Config/Nix.git] / modules / private / websites / florian / integration.nix

diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index ef7d13a511a4733560eb74867b7c1e83c65ae211..4ee160a334f9c07aaaa9798c8882cd5f7b997944 100644 (file)
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.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.florian.integration;
     varDir = "/var/lib/ftp/florian";
     env = config.myEnv.websites.florian;
@@ -8,16 +8,16 @@ in {
   options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
 
   config = lib.mkIf cfg.enable {
-    security.acme2.certs."ftp".extraDomains."florian.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
 
     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}