Make things stable again

Jude is now k3s control plane only
Linode connections to vm-gitlab
Gitlab settings working properly
This commit is contained in:
Greg Hellings
2025-06-17 15:04:19 -05:00
parent aa3953a8b0
commit 238ddade03
4 changed files with 23 additions and 17 deletions
+11 -8
View File
@@ -160,14 +160,17 @@
# Let's do a sound thing # Let's do a sound thing
services = { services = {
k3s.extraFlags = k3s = {
let disableAgent = true;
ip = (builtins.head config.networking.interfaces.enp14s0u1u2.ipv4.addresses).address; extraFlags =
in let
[ ip = (builtins.head config.networking.interfaces.enp14s0u1u2.ipv4.addresses).address;
"--tls-san ${ip}" in
#"--bind-address ${ip}" [
]; "--tls-san ${ip}"
#"--bind-address ${ip}"
];
};
pipewire = { pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
+6 -2
View File
@@ -16,10 +16,14 @@ in
''; '';
}; };
greg.proxies."registry.thehellings.com" = { 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; ssl = true;
genAliases = false; 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 ]; networking.firewall.allowedTCPPorts = [ sshPort ];
+5 -6
View File
@@ -169,7 +169,7 @@ in
nginx = { nginx = {
enable = true; enable = true;
clientMaxBodySize = "10000m"; # 10 GB is fine, right? clientMaxBodySize = "25000m";
virtualHosts = { virtualHosts = {
"vm-gitlab.shire-zebra.ts.net" = { "vm-gitlab.shire-zebra.ts.net" = {
listen = [ listen = [
@@ -183,10 +183,6 @@ in
proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
recommendedProxySettings = true; recommendedProxySettings = true;
}; };
locations."/v2" = {
proxyPass = "http://127.0.0.1:4567/";
recommendedProxySettings = true;
};
extraConfig = '' extraConfig = ''
ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ; ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ; ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ;
@@ -208,8 +204,11 @@ in
extraConfig = '' extraConfig = ''
ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ; ssl_certificate /etc/certs/vm-gitlab.shire-zebra.ts.net.crt ;
ssl_certificate_key /etc/certs/vm-gitlab.shire-zebra.ts.net.key ; 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"
];
}; };
}; };
}; };
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
- 100.88.91.27 # dns? - 100.88.91.27 # dns?
- 100.80.99.48 # exodus - 100.80.99.48 # exodus
- 100.88.91.27 # genesis - 100.88.91.27 # genesis
- 100.91.131.66 # gitlab - 100.117.28.111 # gitlab
- 100.68.203.1 # hosea - 100.68.203.1 # hosea
- 100.84.183.79 # isaiah - 100.84.183.79 # isaiah
- 100.102.186.39 # jeremiah - 100.102.186.39 # jeremiah