diff --git a/servers/containers/conduwuit-testing.container b/servers/containers/conduwuit-testing.container index dfae0ac1..1ff3de58 100644 --- a/servers/containers/conduwuit-testing.container +++ b/servers/containers/conduwuit-testing.container @@ -14,13 +14,15 @@ Image=ghcr.io/girlbossceo/conduwuit:main ReadOnly=true Volume=/var/opt/conduwuit-testing:/var/lib/conduwuit:z,U AutoUpdate=registry -# Network=web.network +Network=web.network:ip=10.89.0.245,ip6=fd76:6f6d:f45e:ea1a::f9 + +Network=pub.network # conduwuit uses quite a few file descriptors, and on some systems it defaults to 1024 Ulimit=nofile=1048567:1048567 Label="traefik.enable=true" Label="traefik.http.routers.conduwuit-testing.rule=(Host(`matrix.pissing.dev`) || (Host(`pissing.dev`) && PathPrefix(`/.well-known/matrix`)))" -Label="traefik.http.services.conduwuit-testing.loadbalancer.server.port=6167" +Label="traefik.http.services.conduwuit-testing.loadbalancer.server.port=6168" Label="traefik.http.routers.conduwuit-testing.entrypoints=https,matrix" @@ -40,7 +42,9 @@ Environment="CONDUWUIT_SERVER_NAME=pissing.dev" Environment="CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit" Environment="CONDUWUIT_DATABASE_BACKEND=rocksdb" # should match the loadbalancer traefik label -Environment="CONDUWUIT_PORT=6167" +Environment="CONDUWUIT_PORT=6168" +Environment="CONDUWUIT_ADDRESS=[\"10.89.0.245\", \"fd76:6f6d:f45e:ea1a::f9\"]" +Label="traefik.docker.network=systemd-web" # in bytes, ~20 MB Environment="CONDUWUIT_MAX_REQUEST_SIZE=20000000" @@ -55,7 +59,6 @@ Environment="CONDUWUIT_ALLOW_INCOMING_PRESENCE=false" Environment="CONDUWUIT_TRUSTED_SERVERS=[\"matrix.org\", \"matrix.pissing.dev\", \"matrix.ellis.link\"]" Environment="CONDUWUIT_LOG=info,hickory_proto::xfer::dns_exchange=error" -Environment="CONDUWUIT_ADDRESS=0.0.0.0" Environment="CONDUWUIT_WELL_KNOWN={ \ client=https://matrix.pissing.dev, \ server=matrix.pissing.dev:443 \ @@ -64,6 +67,9 @@ server=matrix.pissing.dev:443 \ Environment="CONDUWUIT_TURN_URIS=[\"turns:coturn.ellis.link?transport=udp\",\"turns:coturn.ellis.link?transport=tcp\",\"turn:coturn.ellis.link?transport=udp\",\"turn:coturn.ellis.link?transport=tcp\"]" Environment="CONDUWUIT_TURN_SECRET=qjRh55G51K7V0ZqB7Z8ZEkxZjBLJMgkwEs8acFjx" +Environment="CONDUWUIT_URL_PREVIEW_DOMAIN_EXPLICIT_ALLOWLIST=[\"*\"]" +Environment="CONDUWUIT_URL_PREVIEW_BOUND_INTERFACE=eth1" + # Environment="CONDUWUIT_SENTRY=true" # Environment="CONDUWUIT_SENTRY_ENDPOINT=https://c885d1475cef5c54bbd32b1512e0ae20@o4507835405369344.ingest.de.sentry.io/4508059491696720" diff --git a/servers/containers/conduwuit.container b/servers/containers/conduwuit.container index a9d45af0..c20ac021 100644 --- a/servers/containers/conduwuit.container +++ b/servers/containers/conduwuit.container @@ -41,6 +41,8 @@ Environment="CONDUWUIT_DATABASE_PATH=/var/lib/conduwuit" Environment="CONDUWUIT_DATABASE_BACKEND=rocksdb" # should match the loadbalancer traefik label Environment="CONDUWUIT_PORT=6167" +Environment="CONDUWUIT_ADDRESS=0.0.0.0" +Label="traefik.docker.network=systemd-web" # in bytes, ~20 MB Environment="CONDUWUIT_MAX_REQUEST_SIZE=20000000" @@ -54,7 +56,6 @@ Environment="CONDUWUIT_ALLOW_INCOMING_PRESENCE=false" Environment="CONDUWUIT_TRUSTED_SERVERS=[\"matrix.org\", \"matrix.pissing.dev\", \"matrix.ellis.link\"]" Environment="CONDUWUIT_LOG=info,hickory_proto::xfer::dns_exchange=error" -Environment="CONDUWUIT_ADDRESS=0.0.0.0" Environment="CONDUWUIT_WELL_KNOWN={ \ client=https://matrix.ellis.link, \ server=matrix.ellis.link:443 \ @@ -63,6 +64,10 @@ server=matrix.ellis.link:443 \ Environment="CONDUWUIT_TURN_URIS=[\"turns:coturn.ellis.link?transport=udp\",\"turns:coturn.ellis.link?transport=tcp\",\"turn:coturn.ellis.link?transport=udp\",\"turn:coturn.ellis.link?transport=tcp\"]" Environment="CONDUWUIT_TURN_SECRET=qjRh55G51K7V0ZqB7Z8ZEkxZjBLJMgkwEs8acFjx" +Network=pub.network +Environment="CONDUWUIT_URL_PREVIEW_DOMAIN_EXPLICIT_ALLOWLIST=["*"]" +Environment="CONDUWUIT_URL_PREVIEW_BOUND_INTERFACE=eth1@eth1" + Environment="CONDUWUIT_SENTRY=true" Environment="CONDUWUIT_SENTRY_ENDPOINT=https://c885d1475cef5c54bbd32b1512e0ae20@o4507835405369344.ingest.de.sentry.io/4508059491696720" diff --git a/servers/containers/pub.network b/servers/containers/pub.network index fbddf326..afb33005 100644 --- a/servers/containers/pub.network +++ b/servers/containers/pub.network @@ -4,4 +4,4 @@ IPv6=true Subnet=10.89.1.0/24 Gateway=10.89.1.1 Driver=macvlan -Options=parent=eno1 \ No newline at end of file +Options=parent=eno1