From d2bfca1f2541401e8e856b10a95c54632a652d6f Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 27 Sep 2022 11:07:13 +0800 Subject: [PATCH] nixbld: serve nmigen docs --- nixbld-etc-nixos/configuration.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 28f698ac..32eccf08 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -413,6 +413,10 @@ in job = web:web:web command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/web + + job = web:web:nmigen-docs + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/nmigen-docs + job = artiq:sipyco:sipyco-manual-html @@ -797,19 +801,15 @@ in locations."/socket.io/".proxyPass = "http://127.0.0.1:9825"; locations."/socket.io/".proxyWebsockets = true; }; - "nmigen.org" = { + "nmigen.net" = { addSSL = true; enableACME = true; - locations."/".extraConfig = '' - return 307 https://m-labs.hk/gateware/nmigen/; - ''; + root = "${hydraWwwOutputs}/nmigen-docs"; }; - "www.nmigen.org" = { + "www.nmigen.net" = { addSSL = true; enableACME = true; - locations."/".extraConfig = '' - return 307 https://m-labs.hk/gateware/nmigen/; - ''; + root = "${hydraWwwOutputs}/nmigen-docs"; }; }; };