X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fproduction.nix;h=16c6022888357c61f8ce4e9936c2aa148c9b4bd5;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=8d3dfb04a3f54b1c1b1a8afc17af05a4cfc6a874;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/florian/production.nix b/modules/private/websites/florian/production.nix index 8d3dfb0..16c6022 100644 --- a/modules/private/websites/florian/production.nix +++ b/modules/private/websites/florian/production.nix @@ -1,6 +1,6 @@ { 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 = config.myEnv.websites.florian; @@ -17,7 +17,7 @@ in { hosts = [ "tellesflorian.com" "www.tellesflorian.com" ]; root = "${varDir}/tellesflorian.com"; extraConfig = [ - adminer.apache.vhostConf + (adminer.apache.vhostConf null) '' ServerAdmin ${env.server_admin}