M-Labs
/
it-infra
8
0
Fork 4
Code Issues 8 Pull Requests Releases Wiki Activity

nixbld: new msys2 repos

force-ssl-main-website
Sebastien Bourdeauducq 2022-11-03 19:09:35 +08:00
parent 150fac48bf
commit fb745a11e3
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixbld-etc-nixos/configuration.nix
View File

@ -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) 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)
</runcommand> </runcommand>
<runcommand>
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
</runcommand>
<runcommand> <runcommand>
job = artiq:artiq-nac3:msys2-repos 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
</runcommand> </runcommand>
@ -687,18 +692,28 @@ in
auth_basic "Munin"; auth_basic "Munin";
auth_basic_user_file /etc/nixos/secret/muninpasswd; auth_basic_user_file /etc/nixos/secret/muninpasswd;
''; '';
locations."/msys2/" = {
alias = "${hydraWwwOutputs}/msys2/";
extraConfig = ''
autoindex on;
'';
};
}; };
"nixbld.m-labs.hk" = { "nixbld.m-labs.hk" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/".proxyPass = "http://127.0.0.1:3000"; 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" = { "conda.m-labs.hk" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;

3
nixbld-etc-nixos/named/m-labs.hk
View File

@ -1,7 +1,7 @@
$TTL 7200 $TTL 7200
@ SOA 42-200-147-171.static.imsbiz.com. sb.m-labs.hk. ( @ SOA 42-200-147-171.static.imsbiz.com. sb.m-labs.hk. (
2022092301 2022110301
7200 7200
3600 3600
86400 86400
@ -26,6 +26,7 @@ _dmarc TXT "v=DMARC1; p=none"
lab CNAME @ lab CNAME @
www CNAME @ www CNAME @
nixbld CNAME @ nixbld CNAME @
msys2 CNAME @
conda CNAME @ conda CNAME @
git CNAME @ git CNAME @
chat CNAME @ chat CNAME @