collabora: migrate to new infra

This commit is contained in:
jeltz 2024-05-19 15:26:16 +02:00
parent 0782695471
commit 708781b722
Signed by: jeltz
GPG key ID: 800882B66C0C3326
3 changed files with 28 additions and 4 deletions

View file

@ -119,6 +119,10 @@ firewall__zones:
addrs: addrs:
- 2a09:6840:215::1:1 - 2a09:6840:215::1:1
- 45.66.111.206 - 45.66.111.206
collabora.ext:
addrs:
- 2a09:6840:211::1:1
- 10.211.1.1
firewall__input: firewall__input:
- iif: - iif:
@ -287,6 +291,22 @@ firewall__forward:
protocols: protocols:
icmp: true icmp: true
verdict: accept verdict: accept
# Proxy -> Collabora
- src: proxy.pub
dst: collabora.ext
protocols:
tcp:
dport: 9980
verdict: accept
# Collabora -> Proxy
- src: collabora.ext
dst: proxy.pub
protocols:
tcp:
dport:
- 80
- 443
verdict: accept
firewall__nat: firewall__nat:
- src: 10.0.0.0/8 - src: 10.0.0.0/8

View file

@ -281,6 +281,7 @@ knotd__zones:
- grafana - grafana
- nextcloud - nextcloud
- cloud - cloud
- office
target: proxy.pub.infra target: proxy.pub.infra
- name: - name:
- netbox - netbox
@ -290,7 +291,6 @@ knotd__zones:
- gitea - gitea
- re2o - re2o
- vote - vote
- office
target: proxy target: proxy
- name: intranet - name: intranet
target: re2o target: re2o
@ -494,10 +494,10 @@ knotd__zones:
- 2a09:6840:211::1:5 - 2a09:6840:211::1:5
- 10.211.1.5 - 10.211.1.5
collabora.ext: collabora.ext:
#- 2a09:6840:128::220 - 2a09:6840:211::1:1
- 10.128.0.220 - 10.211.1.1
proxy.pub: proxy.pub:
- 2a09:6840:214::1:1 - 2a09:6840:215::1:1
- 45.66.111.206 - 45.66.111.206
108.66.45.in-addr.arpa: 108.66.45.in-addr.arpa:

View file

@ -37,6 +37,10 @@ caddy__routes_https:
reverse: reverse:
- "[2a09:6840:128::98]:3000" - "[2a09:6840:128::98]:3000"
- 10.128.0.98:3000 - 10.128.0.98:3000
office.auro.re:
reverse:
- "[2a09:6840:211::1:1]:9980"
- 10.211.1.1:9980
nextcloud.auro.re: nextcloud.auro.re:
headers: headers:
location: "https://cloud.auro.re{http.request.uri}" location: "https://cloud.auro.re{http.request.uri}"