diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 99aeacd..fd322c6 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -475,9 +475,14 @@ 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:extra-beta:msys2-repos + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-msys2-repos-beta + + job = artiq:artiq-nac3:msys2-repos - command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/msys2 + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-msys2-repos-nac3 @@ -687,18 +692,28 @@ in 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; enableACME = true; locations."/".proxyPass = "http://127.0.0.1:3000"; }; + "msys2.m-labs.hk" = { + forceSSL = true; + enableACME = true; + locations."/artiq-beta/" = { + alias = "${hydraWwwOutputs}/artiq-msys2-repos-beta/"; + extraConfig = '' + autoindex on; + ''; + }; + locations."/artiq-nac3/" = { + alias = "${hydraWwwOutputs}/artiq-msys2-repos-nac3/"; + extraConfig = '' + autoindex on; + ''; + }; + }; "conda.m-labs.hk" = { forceSSL = true; enableACME = true; diff --git a/nixbld-etc-nixos/named/m-labs.hk b/nixbld-etc-nixos/named/m-labs.hk index 7deb9f9..33f94ef 100644 --- a/nixbld-etc-nixos/named/m-labs.hk +++ b/nixbld-etc-nixos/named/m-labs.hk @@ -1,7 +1,7 @@ $TTL 7200 @ SOA 42-200-147-171.static.imsbiz.com. sb.m-labs.hk. ( - 2022092301 + 2022110301 7200 3600 86400 @@ -26,6 +26,7 @@ _dmarc TXT "v=DMARC1; p=none" lab CNAME @ www CNAME @ nixbld CNAME @ +msys2 CNAME @ conda CNAME @ git CNAME @ chat CNAME @