From d3452fc59b9839846225fd254926c64a9c71f071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 18 Apr 2020 16:10:56 +0200 Subject: Refactor websites --- modules/private/websites/florian/production.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/private/websites/florian/production.nix') diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix index 16c6022..1c5ffa6 100644 --- a/modules/private/websites/florian/production.nix +++ b/modules/private/websites/florian/production.nix @@ -1,9 +1,9 @@ { lib, pkgs, config, ... }: let - adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; - cfg = config.myServices.websites.florian.production; - varDir = "/var/lib/ftp/florian"; - env = config.myEnv.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 null) '' ServerAdmin ${env.server_admin} - + DirectoryIndex index.php index.htm index.html Options Indexes FollowSymLinks MultiViews Includes AllowOverride None -- cgit v1.2.3