From 618486ca8a658506711b481586eeb39431e27ba4 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 19 Jul 2019 16:23:47 +0800
Subject: [PATCH] nixbld: update web settings

---
 nixbld-etc-nixos/configuration.nix | 34 ++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 16a07b5..c3ec7de 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -155,7 +155,7 @@ ACTION=="add", SUBSYSTEM=="tty", \
       </runcommand>
       <runcommand>
         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>
       '';
   };
@@ -230,6 +230,7 @@ ACTION=="add", SUBSYSTEM=="tty", \
       extraDomains = {
         "m-labs.hk" = null;
         "www.m-labs.hk" = null;
+        "conda.m-labs.hk" = null;
         "lab.m-labs.hk" = null;
         "git.m-labs.hk" = null;
         "chat.m-labs.hk" = null;
@@ -259,6 +260,8 @@ ACTION=="add", SUBSYSTEM=="tty", \
         locations."/MathJax" = {
           alias = "/var/www/MathJax";
         };
+
+        # legacy URLs, redirect to avoid breaking people's bookmarks
         locations."/gateware.html".extraConfig = ''
           return 301 /gateware/migen/;
         '';
@@ -268,18 +271,24 @@ ACTION=="add", SUBSYSTEM=="tty", \
         locations."/artiq".extraConfig = ''
           return 301 /experiment-control/artiq/;
         '';
+
+        # autogenerated ARTIQ manuals
         locations."/artiq/manual-beta" = {
           alias = "${hydraWwwOutputs}/artiq-manual-html-beta/share/doc/artiq-manual/html";
         };
         locations."/artiq/manual-beta.pdf" = {
           alias = "${hydraWwwOutputs}/artiq-manual-latexpdf-beta/share/doc/artiq-manual/ARTIQ.pdf";
         };
-        locations."/artiq/conda" = {
-          alias = "${hydraWwwOutputs}/conda-channel";
-          extraConfig = ''
-            autoindex on;
-            index bogus_index_file;
-          '';
+
+        # legacy content
+        locations."/artiq/manual" = {
+          alias = "/var/www/m-labs.hk.old/artiq/manual-release-4";
+        };
+        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 {
@@ -300,6 +309,17 @@ ACTION=="add", SUBSYSTEM=="tty", \
         useACMEHost = "nixbld.m-labs.hk";
         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" = {
         forceSSL = true;
         useACMEHost = "nixbld.m-labs.hk";