From 61c008ff434d551a6086ed053f9958a20ab62552 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 5 Apr 2022 11:14:17 +0800 Subject: [PATCH] nixbld: publish msys2 repos on web --- nixbld-etc-nixos/configuration.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 672aa8eb..da557efa 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -382,6 +382,11 @@ in command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-archives/$(jq -r '.build' < $HYDRA_JSON) + + job = artiq:artiq-nac3:msys2-repos + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/msys2 + + jobs = artiq:fast.*:extended-tests @@ -608,13 +613,19 @@ in "m-labs.hk" = mainWebsite; "www.m-labs.hk" = mainWebsite; "lab.m-labs.hk" = { - addSSL = true; + forceSSL = true; useACMEHost = "nixbld.m-labs.hk"; locations."/munin/".alias = "/var/www/munin/"; locations."/munin".extraConfig = '' auth_basic "Munin"; auth_basic_user_file /etc/nixos/secret/muninpasswd; ''; + locations."/msys2/" = { + alias = "${hydraWwwOutputs}/msys2/"; + extraConfig = '' + autoindex on; + ''; + }; }; "nixbld.m-labs.hk" = { forceSSL = true;