Refactor websites

[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 4ee160a334f9c07aaaa9798c8882cd5f7b997944..5ebe53148f014c6c9c84c8f27f60d98776042509 100644 (file)
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -1,9 +1,9 @@
 { lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
-    cfg = config.myServices.websites.florian.integration;
-    varDir = "/var/lib/ftp/florian";
-    env = config.myEnv.websites.florian;
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
+  cfg = config.myServices.websites.florian.integration;
+  varDir = "/var/lib/ftp/florian/florian.immae.eu";
+  env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
 
@@ -11,17 +11,17 @@ in {
     security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
 
     services.websites.env.integration.modules = adminer.apache.modules;
-    services.websites.env.integration.vhostConfs.florian = {
+    services.websites.env.integration.vhostConfs.florian_integration = {
       certName    = "integration";
       addToCerts  = true;
       hosts       = [ "florian.immae.eu" ];
-      root        = "${varDir}/florian.immae.eu";
+      root        = varDir;
       extraConfig = [
         (adminer.apache.vhostConf null)
         ''
         ServerAdmin ${env.server_admin}
 
-        <Directory ${varDir}/florian.immae.eu>
+        <Directory ${varDir}>
           DirectoryIndex index.php index.htm index.html
           Options Indexes FollowSymLinks MultiViews Includes
           AllowOverride None