diff --git a/privfrontends/templates/Caddyfile.j2 b/privfrontends/templates/Caddyfile.j2 index 9eafcf1..88d5162 100644 --- a/privfrontends/templates/Caddyfile.j2 +++ b/privfrontends/templates/Caddyfile.j2 @@ -116,7 +116,7 @@ teddit.{{ server_prefix }}.projectsegfau.lt teddit.projectsegfau.lt t.psf.lt t.{ import torloc teddit } inv.{{ server_prefix }}.projectsegfau.lt i.{{ server_prefix }}.psf.lt { - reverse_proxy {% if server_prefix == 'in' %}192.168.1.65{%endif%}:7573 + reverse_proxy {% if server_prefix == 'in' %}192.168.1.64{%endif%}:7573 header { # disable FLoC tracking Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), screen-wake-lock=(), serial=(), usb=(), sync-xhr=(), xr-spatial-tracking=()"; @@ -253,7 +253,7 @@ search.{{ server_prefix }}.projectsegfau.lt search.projectsegfau.lt s.psf.lt s.{ } } piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projectsegfau.lt pipedapi.{{ server_prefix }}.projectsegfau.lt { - reverse_proxy {% if server_prefix == 'in' %}192.168.1.65{%endif%}:6970 + reverse_proxy {% if server_prefix == 'in' %}192.168.1.64{%endif%}:6970 header { # disable FLoC tracking Permissions-Policy "accelerometer=(), ambient-light-sensor=(), autoplay=(), battery=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), fullscreen=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), magnetometer=(), microphone=(), midi=(), payment=(), picture-in-picture=(), screen-wake-lock=(), serial=(), usb=(), sync-xhr=(), xr-spatial-tracking=()"; @@ -278,7 +278,7 @@ piped.{{ server_prefix }}.projectsegfau.lt pipedproxy.{{ server_prefix }}.projec {% endif %} } pi.{{ server_prefix }}.psf.lt { - reverse_proxy {% if server_prefix == 'in' %}192.168.1.65{%endif%}:6970 { + reverse_proxy {% if server_prefix == 'in' %}192.168.1.64{%endif%}:6970 { header_up Host "{% if server_prefix == 'eu' %}piped.projectsegfau.lt{%else%}piped.{{ server_prefix }}.projectsegfau.lt{%endif%}" } header { diff --git a/privfrontends/templates/in/apps.Caddyfile b/privfrontends/templates/in/apps.Caddyfile index 7d29ff0..56f5f54 100644 --- a/privfrontends/templates/in/apps.Caddyfile +++ b/privfrontends/templates/in/apps.Caddyfile @@ -51,13 +51,10 @@ cinny.projectsegfau.lt cy.psf.lt { projectsegfau.lt { reverse_proxy :1337 import def - reverse_proxy /_matrix/* 192.168.1.64:8449 { + reverse_proxy /_matrix/* 192.168.1.54:8008 { header_up Host "matrix.projectsegfau.lt" } - reverse_proxy /_matrix/client/* 192.168.1.64:81 { - header_up Host "matrix.projectsegfau.lt" - } - reverse_proxy /_synapse/* 192.168.1.64:81 { + reverse_proxy /_synapse/* 192.168.1.54:8008 { header_up Host "matrix.projectsegfau.lt" } reverse_proxy /.well-known/acme-challenge/* 192.168.1.64:5380 @@ -101,13 +98,10 @@ www.projectsegfau.lt www.psf.lt { } matrix.projectsegfau.lt { - reverse_proxy /_matrix/* 192.168.1.64:8449 { + reverse_proxy /_matrix/* 192.168.1.54:8008 { header_up Host "matrix.projectsegfau.lt" } - reverse_proxy /_matrix/client/* 192.168.1.64:81 { - header_up Host "matrix.projectsegfau.lt" - } - reverse_proxy /_synapse/* 192.168.1.64:81 { + reverse_proxy /_synapse/* 192.168.1.54:8008 { header_up Host "matrix.projectsegfau.lt" } import def