From 1b0cc6544e0d2dc6c6556da7e92f02ceef9fcaee Mon Sep 17 00:00:00 2001 From: Egor Savkin Date: Thu, 9 Jan 2025 10:57:29 +0800 Subject: [PATCH] Do not merge PH with main website Signed-off-by: Egor Savkin # Conflicts: # nixbld-etc-nixos/configuration.nix --- nixbld-etc-nixos/configuration.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index b9ebe15c..05dbd284 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -752,6 +752,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:web-ph + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/web-ph + job = web:web:web-intl command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ${pkgs.rsync}/bin/rsync -r -c $(jq -r '.outputs[0].path' < $HYDRA_JSON)/ zolaupd@10.47.3.0:/var/www/m-labs-intl.com/html/ @@ -1049,7 +1053,14 @@ in enableACME = true; globalRedirect = "m-labs.hk"; }; - "m-labs.ph" = mainWebsite; + "m-labs.ph" = { + root = "${hydraWwwOutputs}/web-ph"; + forceSSL = true; + enableACME = true; + extraConfig = '' + error_page 404 /404.html; + ''; + }; "www.m-labs.ph" = { addSSL = true; enableACME = true;