M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

nixbld: update web settings

This commit is contained in:
Sebastien Bourdeauducq 2019-07-19 16:23:47 +08:00
parent 78caeebf02
commit 618486ca8a
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ ACTION=="add", SUBSYSTEM=="tty", \
</runcommand> </runcommand>
<runcommand> <runcommand>
job = artiq:full:conda-channel job = artiq:full:conda-channel
command = ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/conda-channel command = ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-beta
</runcommand> </runcommand>
''; '';
}; };
@ -230,6 +230,7 @@ ACTION=="add", SUBSYSTEM=="tty", \
extraDomains = { extraDomains = {
"m-labs.hk" = null; "m-labs.hk" = null;
"www.m-labs.hk" = null; "www.m-labs.hk" = null;
"conda.m-labs.hk" = null;
"lab.m-labs.hk" = null; "lab.m-labs.hk" = null;
"git.m-labs.hk" = null; "git.m-labs.hk" = null;
"chat.m-labs.hk" = null; "chat.m-labs.hk" = null;
@ -259,6 +260,8 @@ ACTION=="add", SUBSYSTEM=="tty", \
locations."/MathJax" = { locations."/MathJax" = {
alias = "/var/www/MathJax"; alias = "/var/www/MathJax";
}; };
# legacy URLs, redirect to avoid breaking people's bookmarks
locations."/gateware.html".extraConfig = '' locations."/gateware.html".extraConfig = ''
return 301 /gateware/migen/; return 301 /gateware/migen/;
''; '';
@ -268,18 +271,24 @@ ACTION=="add", SUBSYSTEM=="tty", \
locations."/artiq".extraConfig = '' locations."/artiq".extraConfig = ''
return 301 /experiment-control/artiq/; return 301 /experiment-control/artiq/;
''; '';
# autogenerated ARTIQ manuals
locations."/artiq/manual-beta" = { locations."/artiq/manual-beta" = {
alias = "${hydraWwwOutputs}/artiq-manual-html-beta/share/doc/artiq-manual/html"; alias = "${hydraWwwOutputs}/artiq-manual-html-beta/share/doc/artiq-manual/html";
}; };
locations."/artiq/manual-beta.pdf" = { locations."/artiq/manual-beta.pdf" = {
alias = "${hydraWwwOutputs}/artiq-manual-latexpdf-beta/share/doc/artiq-manual/ARTIQ.pdf"; alias = "${hydraWwwOutputs}/artiq-manual-latexpdf-beta/share/doc/artiq-manual/ARTIQ.pdf";
}; };
locations."/artiq/conda" = {
alias = "${hydraWwwOutputs}/conda-channel"; # legacy content
extraConfig = '' locations."/artiq/manual" = {
autoindex on; alias = "/var/www/m-labs.hk.old/artiq/manual-release-4";
index bogus_index_file; };
''; locations."/artiq/manual-release-3" = {
alias = "/var/www/m-labs.hk.old/artiq/manual-release-3";
};
locations."/artiq/manual-release-2" = {
alias = "/var/www/m-labs.hk.old/artiq/manual-release-2";
}; };
}; };
in { in {
@ -300,6 +309,17 @@ ACTION=="add", SUBSYSTEM=="tty", \
useACMEHost = "nixbld.m-labs.hk"; useACMEHost = "nixbld.m-labs.hk";
locations."/".proxyPass = "http://127.0.0.1:3000"; locations."/".proxyPass = "http://127.0.0.1:3000";
}; };
"conda.m-labs.hk" = {
forceSSL = true;
useACMEHost = "nixbld.m-labs.hk";
locations."/artiq-beta" = {
alias = "${hydraWwwOutputs}/artiq-conda-channel-beta";
extraConfig = ''
autoindex on;
index bogus_index_file;
'';
};
};
"git.m-labs.hk" = { "git.m-labs.hk" = {
forceSSL = true; forceSSL = true;
useACMEHost = "nixbld.m-labs.hk"; useACMEHost = "nixbld.m-labs.hk";