gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Final changes for HA GA integration

Browse source
This commit is contained in:
kat witch 2022-04-08 01:04:55 +01:00 • committed by kat
parent f6ccfb9e58
commit 88d93edc3e
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
6 changed files with 29 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/hosts/daiyousei.nix
View file

@ -18,7 +18,6 @@
services.hedgedoc
services.website
services.dnscrypt-proxy
services.daiyousei-access
services.vaultwarden
services.weechat
services.znc

1
config/hosts/yukari.nix
View file

@ -13,7 +13,6 @@
services.tvheadend
services.zfs
services.plex
services.kubernetes
users.arc
];

26
config/services/access.nix
View file

@ -17,8 +17,34 @@
cname = { inherit (config.network.addresses.public) target; };
};
deploy.tf.dns.records.services_home = {
inherit (config.network.dns) zone;
domain = "home";
a = { inherit (config.network.addresses.public.tf.ipv4) address; };
};
deploy.tf.dns.records.services_home_v6 = {
inherit (config.network.dns) zone;
domain = "home";
aaaa = { inherit (config.network.addresses.public.tf.ipv6) address; };
};
services.nginx.virtualHosts = mkMerge [
{
"home.${config.network.dns.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = "http://yukari.ygg.kittywit.ch:8123";
extraConfig = ''
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_http_version 1.1;
'';
};
};
};
"cloud.${config.network.dns.domain}" = {
forceSSL = true;
enableACME = true;

24
config/services/daiyousei-access.nix
View file

@ -1,24 +0,0 @@
{ config, lib, meta, ... }: with lib; {
deploy.tf.dns.records.services_home = {
inherit (config.network.dns) zone;
domain = "home";
a = { inherit (config.network.addresses.public.tf.ipv4) address; };
};
services.nginx.virtualHosts = {
"home.${config.network.dns.domain}" = {
forceSSL = true;
enableACME = true;
locations = {
"/" = {
proxyPass = "http://home.int.kittywit.ch:8123";
extraConfig = ''
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
'';
};
};
};
};
}

19
config/services/ha.nix
View file

@ -11,7 +11,7 @@
"met"
"default_config"
"cast"
"jellyfin"
"plex"
"google"
"google_assistant"
"google_cloud"
@ -47,21 +47,6 @@
};
};
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 ];
network.firewall.private.tcp.ports = [ 8123 ];
}

2
config/tf

@ -1 +1 @@
Subproject commit a008ca692a8217c4f52ceac1d40be39f77c9a324
Subproject commit 0cefe92c06fb4ea84e6af71be67741c0dea70b68