X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fintegration.nix;h=8ac1f46eb14e4299433ed4c00ed509aa0528e495;hb=fa25ffd4583cc362075cd5e1b4130f33306103f0;hp=424ebd48321b45d05a2b6a97554e68158c69e536;hpb=f8026b6e4c869aa108f6361c8ccd50890657994d;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index 424ebd4..8ac1f46 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -1,27 +1,27 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
-    adminer = pkgs.callPackage ../commons/adminer.nix {};
-    cfg = config.myServices.websites.florian.integration;
-    varDir = "/var/lib/ftp/florian";
-    env = myconfig.env.websites.florian;
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
+  cfg = config.myServices.websites.florian.integration;
+  varDir = "/var/lib/ftp/florian/www.ft.immae.dev";
+  env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."ft.immae.dev" = null;
 
-    services.websites.integration.modules = adminer.apache.modules;
-    services.websites.integration.vhostConfs.florian = {
-      certName    = "eldiron";
+    services.websites.env.integration.modules = adminer.apache.modules;
+    services.websites.env.integration.vhostConfs.florian_integration = {
+      certName    = "integration";
       addToCerts  = true;
-      hosts       = [ "florian.immae.eu" ];
-      root        = "${varDir}/florian.immae.eu";
+      hosts       = [ "www.ft.immae.dev" ];
+      root        = varDir;
       extraConfig = [
-        adminer.apache.vhostConf
+        (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