Patching edge to not block gitea recovery
This commit is contained in:
parent
84b60979f2
commit
336ed61235
|
|
@ -51,6 +51,8 @@ resource "null_resource" "edge_services" {
|
||||||
certbot_domain_args = join(" ", [for name in local.server_names : "-d ${name}"])
|
certbot_domain_args = join(" ", [for name in local.server_names : "-d ${name}"])
|
||||||
backend_host = var.backend_host
|
backend_host = var.backend_host
|
||||||
backend_port = tostring(var.backend_port)
|
backend_port = tostring(var.backend_port)
|
||||||
|
gitea_backend_host = var.gitea_backend_host
|
||||||
|
gitea_backend_port = tostring(var.gitea_backend_port)
|
||||||
enable_letsencrypt = tostring(var.enable_letsencrypt)
|
enable_letsencrypt = tostring(var.enable_letsencrypt)
|
||||||
letsencrypt_email = var.letsencrypt_email
|
letsencrypt_email = var.letsencrypt_email
|
||||||
letsencrypt_staging = tostring(var.letsencrypt_staging)
|
letsencrypt_staging = tostring(var.letsencrypt_staging)
|
||||||
|
|
@ -108,6 +110,8 @@ server_names="${self.triggers.server_names}"
|
||||||
certbot_domain_args="${self.triggers.certbot_domain_args}"
|
certbot_domain_args="${self.triggers.certbot_domain_args}"
|
||||||
backend_host="${self.triggers.backend_host}"
|
backend_host="${self.triggers.backend_host}"
|
||||||
backend_port="${self.triggers.backend_port}"
|
backend_port="${self.triggers.backend_port}"
|
||||||
|
gitea_backend_host="${self.triggers.gitea_backend_host}"
|
||||||
|
gitea_backend_port="${self.triggers.gitea_backend_port}"
|
||||||
enable_letsencrypt="${self.triggers.enable_letsencrypt}"
|
enable_letsencrypt="${self.triggers.enable_letsencrypt}"
|
||||||
letsencrypt_email="${self.triggers.letsencrypt_email}"
|
letsencrypt_email="${self.triggers.letsencrypt_email}"
|
||||||
letsencrypt_staging="${self.triggers.letsencrypt_staging}"
|
letsencrypt_staging="${self.triggers.letsencrypt_staging}"
|
||||||
|
|
@ -129,8 +133,13 @@ install_missing_packages() {
|
||||||
install_missing_packages ca-certificates curl openssl
|
install_missing_packages ca-certificates curl openssl
|
||||||
|
|
||||||
if ! curl -fsS --connect-timeout 10 -H "Host: $server_name" "http://$backend_host:$backend_port/" >/dev/null; then
|
if ! curl -fsS --connect-timeout 10 -H "Host: $server_name" "http://$backend_host:$backend_port/" >/dev/null; then
|
||||||
echo "Cannot reach Traefik backend http://$backend_host:$backend_port/ for $server_name from the edge host." >&2
|
echo "Warning: cannot reach Traefik backend http://$backend_host:$backend_port/ for $server_name from the edge host." >&2
|
||||||
echo "Check that MetalLB assigned the Traefik LoadBalancer IP and that the edge host has a route to it." >&2
|
echo "The edge proxy will still be deployed so independent routes such as /git/ can recover." >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! curl -sS --connect-timeout 10 "http://$gitea_backend_host:$gitea_backend_port/git/" >/dev/null; then
|
||||||
|
echo "Cannot reach Gitea backend http://$gitea_backend_host:$gitea_backend_port/git/ from the edge host." >&2
|
||||||
|
echo "Check the Debian host Tailscale IP, Gitea container, and port publishing." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ variable "gitea_backend_port" {
|
||||||
|
|
||||||
variable "gitea_backend_host" {
|
variable "gitea_backend_host" {
|
||||||
type = string
|
type = string
|
||||||
default = "192.168.100.73"
|
default = "100.85.138.30"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "haproxy_stats_user" {
|
variable "haproxy_stats_user" {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue