From bdf2fedcfed9d1453c2b53e6d04090145aecaa0b Mon Sep 17 00:00:00 2001 From: kat witch Date: Wed, 23 Mar 2022 13:01:09 +0000 Subject: [PATCH] whee --- config/services/access.nix | 19 +++++++++++++++++++ config/services/ha.nix | 16 ++++++++++++++++ config/tf | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/config/services/access.nix b/config/services/access.nix index 864cd75c..99c44015 100644 --- a/config/services/access.nix +++ b/config/services/access.nix @@ -17,6 +17,12 @@ cname = { inherit (config.network.addresses.public) target; }; }; + deploy.tf.dns.records.services_home = { + inherit (config.network.dns) zone; + domain = "home"; + cname = { inherit (config.network.addresses.public) target; }; + }; + services.nginx.virtualHosts = mkMerge [ { "cast.${config.network.dns.domain}" = { @@ -33,6 +39,19 @@ "/".proxyPass = "http://cloud.int.kittywit.ch:80/"; }; }; + "home.${config.network.dns.domain}" = { + forceSSL = true; + enableACME = true; + locations = { + "/" = { + proxyPass = "http://home.int.kittywit.ch:80/"; + extraConfig = '' + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + ''; + }; + }; + }; "media.${config.network.dns.domain}" = { forceSSL = true; enableACME = true; diff --git a/config/services/ha.nix b/config/services/ha.nix index a52de530..9e4dcce5 100644 --- a/config/services/ha.nix +++ b/config/services/ha.nix @@ -17,5 +17,21 @@ ]; }; + deploy.tf.dns.records.services_internal_home = { + inherit (config.network.dns) zone; + domain = "home.int"; + cname = { inherit (config.network.addresses.yggdrasil) target; }; + }; + + services.nginx.virtualHosts."home.kittywit.ch" = { + locations."/" = { + proxyPass = "http://127.0.0.1:8123"; + extraConfig = '' + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + ''; + }; + }; + network.firewall.public.tcp.ports = [ 8123 ]; } diff --git a/config/tf b/config/tf index 1c019e02..2ad93ea3 160000 --- a/config/tf +++ b/config/tf @@ -1 +1 @@ -Subproject commit 1c019e026cb270aec9471aba005a7e46dddb985c +Subproject commit 2ad93ea38ae53603ec670ca30a307033da37248d