From 5400b9b6f65451d41a9106fae6fc00f97d83f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 25 Mar 2020 11:57:48 +0100 Subject: Upgrade nixos --- modules/private/websites/florian/integration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/private/websites/florian/integration.nix') diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix index 57c4006..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; @@ -8,7 +8,7 @@ in { options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration"; config = lib.mkIf cfg.enable { - security.acme2.certs."ftp".extraDomains."florian.immae.eu" = null; + security.acme.certs."ftp".extraDomains."florian.immae.eu" = null; services.websites.env.integration.modules = adminer.apache.modules; services.websites.env.integration.vhostConfs.florian = { @@ -17,7 +17,7 @@ in { hosts = [ "florian.immae.eu" ]; root = "${varDir}/florian.immae.eu"; extraConfig = [ - adminer.apache.vhostConf + (adminer.apache.vhostConf null) '' ServerAdmin ${env.server_admin} -- cgit v1.2.3