From 29f8cb850d74b456d6481a456311bbf5361d328c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 1 Jun 2019 12:51:51 +0200 Subject: Refactor websites options --- modules/private/buildbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/private/buildbot/default.nix') diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix index d023a83..f307606 100644 --- a/modules/private/buildbot/default.nix +++ b/modules/private/buildbot/default.nix @@ -37,11 +37,11 @@ in extraGroups = [ "keys" ]; }; - services.websites.tools.watchPaths = lib.attrsets.mapAttrsToList + services.websites.env.tools.watchPaths = lib.attrsets.mapAttrsToList (k: project: "/var/secrets/buildbot/${project.name}/webhook-httpd-include") myconfig.env.buildbot.projects; - services.websites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: '' + services.websites.env.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: '' RedirectMatch permanent "^/buildbot/${project.name}$" "/buildbot/${project.name}/" RewriteEngine On RewriteRule ^/buildbot/${project.name}/ws(.*)$ unix:///run/buildbot/${project.name}.sock|ws://git.immae.eu/ws$1 [P,NE,QSA,L] -- cgit v1.2.3