X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fintegration.nix;h=4ee160a334f9c07aaaa9798c8882cd5f7b997944;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=00de76195a12a9adee3d43e096fec2f9d98706b1;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix index 00de761..4ee160a 100644 --- a/modules/private/websites/florian/integration.nix +++ b/modules/private/websites/florian/integration.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.integration; varDir = "/var/lib/ftp/florian"; env = config.myEnv.websites.florian; @@ -12,12 +12,12 @@ in { services.websites.env.integration.modules = adminer.apache.modules; services.websites.env.integration.vhostConfs.florian = { - certName = "eldiron"; + certName = "integration"; addToCerts = true; hosts = [ "florian.immae.eu" ]; root = "${varDir}/florian.immae.eu"; extraConfig = [ - adminer.apache.vhostConf + (adminer.apache.vhostConf null) '' ServerAdmin ${env.server_admin}