diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 5aacd89..a1bf976 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -651,6 +651,16 @@ 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-intl + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && export HOME=`mktemp -d` && \ + mkdir $HOME/.ssh && \ + cp /opt/hydra_id_ed25519 $HOME/.ssh/id_ed25519 && \ + cp /opt/hydra_id_ed25519.pub $HOME/.ssh/id_ed25519.pub && \ + echo "5.78.86.156 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMbV69aqkHdQ1T5lMuALyHjNowU1rottZtEV4OhKQ6Y" > $HOME/.ssh/known_hosts && \ + chmod 600 $HOME/.ssh/id_ed25519 && \ + rsync -r -c $(jq -r '.outputs[0].path' < $HYDRA_JSON) zolaupd@5.78.86.156:/var/www/m-labs-intl.com/html/ + job = web:web:nmigen-docs command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/nmigen-docs @@ -1154,7 +1164,7 @@ in enable = true; localDnsResolver = false; # conflicts with dnsmasq fqdn = "mail.m-labs.hk"; - domains = [ "m-labs.hk" "m-labs.ph" "193thz.com" "malloctech.fr" ]; + domains = [ "m-labs.hk" "m-labs.ph" "193thz.com" "malloctech.fr" "m-labs-intl.com" ]; enablePop3 = true; enablePop3Ssl = true; certificateScheme = "acme-nginx"; diff --git a/nixbld-etc-nixos/named/m-labs-intl.com b/nixbld-etc-nixos/named/m-labs-intl.com index 7b2afb2..b6e940b 100644 --- a/nixbld-etc-nixos/named/m-labs-intl.com +++ b/nixbld-etc-nixos/named/m-labs-intl.com @@ -18,3 +18,4 @@ ns A 94.190.212.123 ns AAAA 2001:470:18:390::2 www CNAME @ +hooks CNAME @