From 3f33c1c98005022e59a8226a9a4edca275f076df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Bourdeauducq?= Date: Wed, 8 Jan 2025 10:32:29 +0800 Subject: [PATCH] Revert "Use dedicated website folder for PH region" This reverts commit 0b3fe57a937f35db33ce8800b896583f61715d12. --- nixbld-etc-nixos/configuration.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 398bd199..6f530f25 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -752,10 +752,6 @@ 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/ @@ -1053,10 +1049,7 @@ in enableACME = true; globalRedirect = "m-labs.hk"; }; - "m-labs.ph" = mainWebsite // { - root = "${hydraWwwOutputs}/web-ph"; - forceSSL = true; - }; + "m-labs.ph" = mainWebsite; "www.m-labs.ph" = { addSSL = true; enableACME = true;