diff --git a/ops/machines/sanduny/default.nix b/ops/machines/sanduny/default.nix index dd2885d7b..079b3a163 100644 --- a/ops/machines/sanduny/default.nix +++ b/ops/machines/sanduny/default.nix @@ -15,6 +15,7 @@ in { imports = [ (mod "tvl-users.nix") + (mod "www/sanduny.tvl.su.nix") ]; networking = { diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 61f44a5ec..64238532c 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -41,6 +41,7 @@ in "${depot.path}/ops/modules/www/todo.tvl.fyi.nix" "${depot.path}/ops/modules/www/tvl.fyi.nix" "${depot.path}/ops/modules/www/tvl.su.nix" + "${depot.path}/ops/modules/www/whitby.tvl.fyi.nix" "${depot.path}/ops/modules/www/wigglydonke.rs.nix" "${depot.third_party.agenix.src}/modules/age.nix" "${pkgs.path}/nixos/modules/services/web-apps/gerrit.nix" diff --git a/ops/modules/www/sanduny.tvl.su.nix b/ops/modules/www/sanduny.tvl.su.nix new file mode 100644 index 000000000..1a60d06fa --- /dev/null +++ b/ops/modules/www/sanduny.tvl.su.nix @@ -0,0 +1,16 @@ +# Redirect sanduny.tvl.su to the machine configuration. + +{ + imports = [ + ./base.nix + ]; + + config.services.nginx.virtualHosts."sanduny.tvl.su" = { + serverName = "sanduny.tvl.su"; + enableACME = true; + + extraConfig = '' + return 302 https://at.tvl.fyi/?q=%2F%2Fops%2Fmachines%2Fsanduny; + ''; + }; +} diff --git a/ops/modules/www/whitby.tvl.fyi.nix b/ops/modules/www/whitby.tvl.fyi.nix new file mode 100644 index 000000000..bcd7a76ec --- /dev/null +++ b/ops/modules/www/whitby.tvl.fyi.nix @@ -0,0 +1,17 @@ +# Redirect whitby.tvl.fyi to the machine configuration. + +{ + imports = [ + ./base.nix + ]; + + config.services.nginx.virtualHosts."whitby.tvl.fyi" = { + serverName = "whitby.tvl.fyi"; + serverAliases = [ "whitby.tvl.su" ]; + enableACME = true; + + extraConfig = '' + return 302 https://at.tvl.fyi/?q=%2F%2Fops%2Fmachines%2Fwhitby; + ''; + }; +}