X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fproduction.nix;h=1c5ffa639e5f417aaa00c5a43c320fe04a0d2cfa;hb=fa25ffd4583cc362075cd5e1b4130f33306103f0;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..1c5ffa6 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 {};
-    cfg = config.myServices.websites.florian.production;
-    varDir = "/var/lib/ftp/florian";
-    env = myconfig.env.websites.florian;
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
+  cfg = config.myServices.websites.florian.production;
+  varDir = "/var/lib/ftp/florian/tellesflorian.com";
+  env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.production.enable = lib.mkEnableOption "enable Florian's website production";
 
@@ -11,17 +11,17 @@ in {
     security.acme.certs."ftp".extraDomains."tellesflorian.com" = null;
 
     services.websites.env.production.modules = adminer.apache.modules;
-    services.websites.env.production.vhostConfs.florian = {
+    services.websites.env.production.vhostConfs.florian_production = {
       certName     = "florian";
       certMainHost = "tellesflorian.com";
       hosts        = [ "tellesflorian.com" "www.tellesflorian.com" ];
-      root         = "${varDir}/tellesflorian.com";
+      root         = varDir;
       extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
         ''
         ServerAdmin ${env.server_admin}
 
-        <Directory ${varDir}/tellesflorian.com>
+        <Directory ${varDir}>
           DirectoryIndex index.php index.htm index.html
           Options Indexes FollowSymLinks MultiViews Includes
           AllowOverride None