diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-06-01 12:51:51 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-06-01 13:32:32 +0200 |
| commit | 29f8cb850d74b456d6481a456311bbf5361d328c (patch) | |
| tree | 2bdcdc21780950683d0528da66b050f2a24e3b20 /modules/private/buildbot | |
| parent | 2e48907d64491a06454b342a1a56d03a0835753d (diff) | |
| download | Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.gz Nix-29f8cb850d74b456d6481a456311bbf5361d328c.tar.zst Nix-29f8cb850d74b456d6481a456311bbf5361d328c.zip | |
Refactor websites options
Diffstat (limited to 'modules/private/buildbot')
| -rw-r--r-- | modules/private/buildbot/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
| 37 | extraGroups = [ "keys" ]; | 37 | extraGroups = [ "keys" ]; |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | services.websites.tools.watchPaths = lib.attrsets.mapAttrsToList | 40 | services.websites.env.tools.watchPaths = lib.attrsets.mapAttrsToList |
| 41 | (k: project: "/var/secrets/buildbot/${project.name}/webhook-httpd-include") | 41 | (k: project: "/var/secrets/buildbot/${project.name}/webhook-httpd-include") |
| 42 | myconfig.env.buildbot.projects; | 42 | myconfig.env.buildbot.projects; |
| 43 | 43 | ||
| 44 | services.websites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: '' | 44 | services.websites.env.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: '' |
| 45 | RedirectMatch permanent "^/buildbot/${project.name}$" "/buildbot/${project.name}/" | 45 | RedirectMatch permanent "^/buildbot/${project.name}$" "/buildbot/${project.name}/" |
| 46 | RewriteEngine On | 46 | RewriteEngine On |
| 47 | RewriteRule ^/buildbot/${project.name}/ws(.*)$ unix:///run/buildbot/${project.name}.sock|ws://git.immae.eu/ws$1 [P,NE,QSA,L] | 47 | RewriteRule ^/buildbot/${project.name}/ws(.*)$ unix:///run/buildbot/${project.name}.sock|ws://git.immae.eu/ws$1 [P,NE,QSA,L] |