From d61b7a376ce3ac27fa7cf82fc8ffb8ed2f25ca3e Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 30 Oct 2021 15:59:28 +0200 Subject: [PATCH] deploy zookeeper, k3s --- hosts/k3s/configuration.nix | 1 + hosts/nginx/configuration.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/k3s/configuration.nix b/hosts/k3s/configuration.nix index 0af4b9e..7de2f51 100644 --- a/hosts/k3s/configuration.nix +++ b/hosts/k3s/configuration.nix @@ -44,6 +44,7 @@ "--cluster-init" # Enable embedded etcd "--disable=servicelb" # disable servicelb "--no-deploy=traefik" # we want to configure traefik ourselves (or use nginx instead) + "--cluster-cidr=10.69.0.0/16" # the default of 10.42.0.0/16 clashes with my own network ]; }; } diff --git a/hosts/nginx/configuration.nix b/hosts/nginx/configuration.nix index 9fbfc5a..44b2ea3 100644 --- a/hosts/nginx/configuration.nix +++ b/hosts/nginx/configuration.nix @@ -41,16 +41,16 @@ }; }; + # TODO: Make a function for adding hostnames to k8s endpoint(s). virtualHosts."zookeeper.0x76.dev" = { enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://10.42.43.28:8085/"; + proxyPass = "http://10.42.42.150:8000/"; proxyWebsockets = true; }; }; - # TODO: Make a function for adding hostnames to k8s endpoint(s). virtualHosts."wooloofan.club" = { enableACME = true; forceSSL = true;