diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-01-16T20·44+0300 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-01-17T05·42+0000 |
| commit | e4976c49dc54a6bce0271dc291a27b721259f27b (patch) | |
| tree | dd0020826be894829f05b5a7cba6a7b958e24fec | |
| parent | e7a7e09300251a294a3cad3b59695ab7fcb1fec9 (diff) | |
feat(ops/nixos): Serve tazj.in from whitby temporarily r/2116
camden.tazj.in (the host in my flat) is going down as my belongings are being moved into storage. Change-Id: Id66512fd2ec6dbdcb6dfc3862af49cfadb15cfa1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2405 Tested-by: BuildkiteCI Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: glittershark <grfn@gws.fyi>
| -rw-r--r-- | ops/nixos/whitby/default.nix | 3 | ||||
| -rw-r--r-- | ops/nixos/www/tazj.in.nix | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/ops/nixos/whitby/default.nix b/ops/nixos/whitby/default.nix index 4210bcf57b..a0b5ffd478 100644 --- a/ops/nixos/whitby/default.nix +++ b/ops/nixos/whitby/default.nix @@ -25,13 +25,14 @@ in lib.fix(self: { "${depot.depotPath}/ops/nixos/sourcegraph.nix" "${depot.depotPath}/ops/nixos/tvl-slapd/default.nix" "${depot.depotPath}/ops/nixos/tvl-sso/default.nix" + "${depot.depotPath}/ops/nixos/www/b.tvl.fyi.nix" "${depot.depotPath}/ops/nixos/www/cl.tvl.fyi.nix" "${depot.depotPath}/ops/nixos/www/code.tvl.fyi.nix" "${depot.depotPath}/ops/nixos/www/cs.tvl.fyi.nix" "${depot.depotPath}/ops/nixos/www/login.tvl.fyi.nix" + "${depot.depotPath}/ops/nixos/www/tazj.in.nix" "${depot.depotPath}/ops/nixos/www/todo.tvl.fyi.nix" "${depot.depotPath}/ops/nixos/www/tvl.fyi.nix" - "${depot.depotPath}/ops/nixos/www/b.tvl.fyi.nix" "${depot.depotPath}/ops/nixos/www/wigglydonke.rs.nix" "${depot.third_party.nixpkgsSrc}/nixos/modules/services/web-apps/gerrit.nix" ]; diff --git a/ops/nixos/www/tazj.in.nix b/ops/nixos/www/tazj.in.nix new file mode 100644 index 0000000000..b90773f812 --- /dev/null +++ b/ops/nixos/www/tazj.in.nix @@ -0,0 +1,30 @@ +# serve tazjin's website & blog +{ config, lib, pkgs, ... }: + +let depot = config.depot; +in { + imports = [ + ./base.nix + ]; + + config = { + services.nginx.virtualHosts."tazj.in" = { + enableACME = true; + forceSSL = true; + root = depot.users.tazjin.homepage; + + extraConfig = '' + ${depot.users.tazjin.blog.oldRedirects} + location /blog/ { + alias ${depot.users.tazjin.blog.rendered}/; + + if ($request_uri ~ ^/(.*)\.html$) { + return 302 /$1; + } + + try_files $uri $uri.html $uri/ =404; + } + ''; + }; + }; +} |