Upgrade nixos

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

diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix
index 9b310b8b6b6971790e5781a050ed004c4cf5d94d..16c6022888357c61f8ce4e9936c2aa148c9b4bd5 100644 (file)
--- a/modules/private/websites/florian/production.nix
+++ b/modules/private/websites/florian/production.nix
@@ -1,23 +1,23 @@
-{ 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";
 
   config = lib.mkIf cfg.enable {
     security.acme.certs."ftp".extraDomains."tellesflorian.com" = null;
 
-    services.websites.production.modules = adminer.apache.modules;
-    services.websites.production.vhostConfs.florian = {
+    services.websites.env.production.modules = adminer.apache.modules;
+    services.websites.env.production.vhostConfs.florian = {
       certName     = "florian";
       certMainHost = "tellesflorian.com";
       hosts        = [ "tellesflorian.com" "www.tellesflorian.com" ];
       root         = "${varDir}/tellesflorian.com";
       extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
         ''
         ServerAdmin ${env.server_admin}