diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix index 855ad9f..2abbbae 100644 --- a/hosts/jude/default.nix +++ b/hosts/jude/default.nix @@ -160,14 +160,17 @@ # Let's do a sound thing services = { - k3s.extraFlags = - let - ip = (builtins.head config.networking.interfaces.enp14s0u1u2.ipv4.addresses).address; - in - [ - "--tls-san ${ip}" - #"--bind-address ${ip}" - ]; + k3s = { + disableAgent = true; + extraFlags = + let + ip = (builtins.head config.networking.interfaces.enp14s0u1u2.ipv4.addresses).address; + in + [ + "--tls-san ${ip}" + #"--bind-address ${ip}" + ]; + }; pipewire = { enable = true; alsa.enable = true; diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index a9ceeaa..dec0ef9 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -16,10 +16,14 @@ in ''; }; greg.proxies."registry.thehellings.com" = { - target = "https://vm-gitlab.shire-zebra.ts.net:5000"; + target = "http://vm-gitlab.shire-zebra.ts.net:5000"; ssl = true; genAliases = false; - extraConfig = "client_max_body_size 25000m;"; + extraConfig = '' + proxy_set_header X-Forwarded-Proto https; + proxy_set_header X-Forwarded-Ssl on; + client_max_body_size 25000m; + ''; }; networking.firewall.allowedTCPPorts = [ sshPort ]; diff --git a/hosts/vm-gitlab/default.nix b/hosts/vm-gitlab/default.nix index e76faa3..8679bec 100644 --- a/hosts/vm-gitlab/default.nix +++ b/hosts/vm-gitlab/default.nix @@ -169,7 +169,7 @@ in nginx = { enable = true; - clientMaxBodySize = "10000m"; # 10 GB is fine, right? + clientMaxBodySize = "25000m"; virtualHosts = { "vm-gitlab.shire-zebra.ts.net" = { listen = [ @@ -183,10 +183,6 @@ in proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; recommendedProxySettings = true; }; - locations."/v2" = { - proxyPass = "http://127.0.0.1:4567/"; - recommendedProxySettings = true; - }; extraConfig = '' ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ; ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ; @@ -208,8 +204,11 @@ in extraConfig = '' ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ; ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ; - client_max_body_size 10000m ; + client_max_body_size 25000m ; ''; + serverAliases = [ + "vm-gitlab.shire-zebra.ts.net" + ]; }; }; }; diff --git a/manifests/databases/ingress.yaml b/manifests/databases/ingress.yaml index f75c920..21d8ecc 100644 --- a/manifests/databases/ingress.yaml +++ b/manifests/databases/ingress.yaml @@ -14,7 +14,7 @@ spec: - 100.88.91.27 # dns? - 100.80.99.48 # exodus - 100.88.91.27 # genesis - - 100.91.131.66 # gitlab + - 100.117.28.111 # gitlab - 100.68.203.1 # hosea - 100.84.183.79 # isaiah - 100.102.186.39 # jeremiah