summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2025-02-14 09:33:41 +0100
committerPatrick Spek <p.spek@tyil.nl>2025-02-14 09:33:41 +0100
commit237526b3a12ec557131e1cbd12db357a328d371e (patch)
tree9066073da67faf1c8396bbd8503c649607a94ddb
parent7bc2206c576c34ecfeeae75c3ccba99f84ffb7bc (diff)
downloadtyilnet-237526b3a12ec557131e1cbd12db357a328d371e.tar.gz
tyilnet-237526b3a12ec557131e1cbd12db357a328d371e.tar.bz2
Split sistri and tovah to haproxy and nginx
-rw-r--r--defaults8
-rw-r--r--hosts.d/sistri.tyil.net8
-rw-r--r--hosts.d/tovah.tyil.net8
3 files changed, 16 insertions, 8 deletions
diff --git a/defaults b/defaults
index 5b13838..a9e7225 100644
--- a/defaults
+++ b/defaults
@@ -35,15 +35,7 @@ k3s-node.flannel-iface&=vpn-tinc.name
k3s-node.role=agent
k3s-node.service-cidr&=k3s-master.service-cidr
lb-haproxy.listen.http.proxy-protocol=yes
-lb-haproxy.listen.http.upstream.mieshu=[fd68:1057:1992:3381:0:3:3317:1]:31080
-lb-haproxy.listen.http.upstream.nouki=[fd68:1057:1992:3381:0:2:3317:1]:31080
-lb-haproxy.listen.http.upstream.oolah=[fd68:1057:1992:3381:0:1:3317:1]:31080
-lb-haproxy.listen.http.upstream.ricui=[fd68:1057:1992:3381:0:1:1:4]:31080
lb-haproxy.listen.https.proxy-protocol=yes
-lb-haproxy.listen.https.upstream.mieshu=[fd68:1057:1992:3381:0:3:3317:1]:31443
-lb-haproxy.listen.https.upstream.nouki=[fd68:1057:1992:3381:0:2:3317:1]:31443
-lb-haproxy.listen.https.upstream.oolah=[fd68:1057:1992:3381:0:1:3317:1]:31443
-lb-haproxy.listen.https.upstream.ricui=[fd68:1057:1992:3381:0:1:1:4]:31443
lb-haproxy.stats.bind.tyilnet1057=[::]:8404 interface tyilnet1057
lb-haproxy.timeout.client=121000
lb-haproxy.timeout.server=121000
diff --git a/hosts.d/sistri.tyil.net b/hosts.d/sistri.tyil.net
index ecbb123..2390299 100644
--- a/hosts.d/sistri.tyil.net
+++ b/hosts.d/sistri.tyil.net
@@ -1,6 +1,14 @@
lb-haproxy.listen.http.bind.ipv4=217.160.138.210:80
lb-haproxy.listen.http.bind.ipv6=[2a01:239:2bb:1200::1]:80
+lb-haproxy.listen.http.upstream.mieshu=[fd68:1057:1992:3381:0:3:3317:1]:31080
+lb-haproxy.listen.http.upstream.nouki=[fd68:1057:1992:3381:0:2:3317:1]:31080
+lb-haproxy.listen.http.upstream.oolah=[fd68:1057:1992:3381:0:1:3317:1]:31080
+lb-haproxy.listen.http.upstream.ricui=[fd68:1057:1992:3381:0:1:1:4]:31080
lb-haproxy.listen.https.bind.ipv4=217.160.138.210:443
lb-haproxy.listen.https.bind.ipv6=[2a01:239:2bb:1200::1]:443
+lb-haproxy.listen.https.upstream.mieshu=[fd68:1057:1992:3381:0:3:3317:1]:31443
+lb-haproxy.listen.https.upstream.nouki=[fd68:1057:1992:3381:0:2:3317:1]:31443
+lb-haproxy.listen.https.upstream.oolah=[fd68:1057:1992:3381:0:1:3317:1]:31443
+lb-haproxy.listen.https.upstream.ricui=[fd68:1057:1992:3381:0:1:1:4]:31443
vpn-tinc.ipv4=10.57.1.8
vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:4:1
diff --git a/hosts.d/tovah.tyil.net b/hosts.d/tovah.tyil.net
index b430c0e..b78b8dd 100644
--- a/hosts.d/tovah.tyil.net
+++ b/hosts.d/tovah.tyil.net
@@ -1,6 +1,14 @@
lb-haproxy.listen.http.bind.ipv4=217.160.138.170:80
lb-haproxy.listen.http.bind.ipv6=[2a01:239:2a7:f300::1]:80
+lb-haproxy.listen.http.upstream.mieshu=[fd68:1057:1992:3381:0:3:3317:1]:32080
+lb-haproxy.listen.http.upstream.nouki=[fd68:1057:1992:3381:0:2:3317:1]:32080
+lb-haproxy.listen.http.upstream.oolah=[fd68:1057:1992:3381:0:1:3317:1]:32080
+lb-haproxy.listen.http.upstream.ricui=[fd68:1057:1992:3381:0:1:1:4]:32080
lb-haproxy.listen.https.bind.ipv4=217.160.138.170:443
lb-haproxy.listen.https.bind.ipv6=[2a01:239:2a7:f300::1]:443
+lb-haproxy.listen.https.upstream.mieshu=[fd68:1057:1992:3381:0:3:3317:1]:32443
+lb-haproxy.listen.https.upstream.nouki=[fd68:1057:1992:3381:0:2:3317:1]:32443
+lb-haproxy.listen.https.upstream.oolah=[fd68:1057:1992:3381:0:1:3317:1]:32443
+lb-haproxy.listen.https.upstream.ricui=[fd68:1057:1992:3381:0:1:1:4]:32443
vpn-tinc.ipv4=10.57.1.9
vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:4:2