From 897be921a60ae308f8148c8b76d41599746c189a Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Mon, 8 Sep 2025 00:07:41 +0200 Subject: [PATCH] Fix HTTP3 caddy, update TF2 Signed-off-by: Bensuperpc --- .../services/caddy/config/website/main.caddy | 18 +++++++++--------- .../caddy/config/website/qbittorrent.caddy | 4 ++++ .../services/caddy/docker-compose.caddy.yml | 6 ++++-- .../qbittorrent/docker-compose.qbittorrent.yml | 1 + .../docker-compose.teamfortress2.yml | 2 +- .../teamfortress2/env/teamfortress2.env | 6 ++++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/infrastructure/services/caddy/config/website/main.caddy b/infrastructure/services/caddy/config/website/main.caddy index 6054a2c..de05cf5 100644 --- a/infrastructure/services/caddy/config/website/main.caddy +++ b/infrastructure/services/caddy/config/website/main.caddy @@ -16,12 +16,12 @@ www.{$MAIN_DOMAIN} { redir https://www.{host}{uri} permanent } -#public.{$MAIN_DOMAIN} { -# root * /public_data -# file_server browse -# -# header / { -# Cache-Control "no-store" -# import header_common -# } -#} +public.{$MAIN_DOMAIN} { + root * /public_data + file_server browse + + header / { + Cache-Control "no-store" + import header_common + } +} diff --git a/infrastructure/services/caddy/config/website/qbittorrent.caddy b/infrastructure/services/caddy/config/website/qbittorrent.caddy index 0cb6c83..8a021db 100644 --- a/infrastructure/services/caddy/config/website/qbittorrent.caddy +++ b/infrastructure/services/caddy/config/website/qbittorrent.caddy @@ -1,5 +1,9 @@ torrent.{$MAIN_DOMAIN} { reverse_proxy qbittorrent:8080 + header { + Cache-Control "no-store" + import header_common + } } qbittorrent.{$MAIN_DOMAIN} { diff --git a/infrastructure/services/caddy/docker-compose.caddy.yml b/infrastructure/services/caddy/docker-compose.caddy.yml index 0465cc8..12ed49e 100644 --- a/infrastructure/services/caddy/docker-compose.caddy.yml +++ b/infrastructure/services/caddy/docker-compose.caddy.yml @@ -10,8 +10,10 @@ services: condition: service_completed_successfully restart: on-failure:5 ports: - - 80:80 - - 443:443 + - 80:80/tcp + - 80:80/udp + - 443:443/tcp + - 443:443/udp volumes: - caddy_data:/data:rw - caddy_config:/config:rw diff --git a/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml b/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml index 4354537..0f3fc37 100644 --- a/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml +++ b/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml @@ -19,6 +19,7 @@ services: volumes: - qbittorrent_config:/config - public_data:/downloads + - private_data:/private_downloads networks: - infra-network security_opt: diff --git a/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/docker-compose.teamfortress2.yml b/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/docker-compose.teamfortress2.yml index 3f78518..6c29446 100644 --- a/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/docker-compose.teamfortress2.yml +++ b/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/docker-compose.teamfortress2.yml @@ -1,7 +1,7 @@ services: # Team Fortress 2 server teamfortress2_server: - image: cm2network/tf2:latest-x64 + image: cm2network/tf2:sourcemod-x64 container_name: teamfortress2_server profiles: - teamfortress2_server diff --git a/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/env/teamfortress2.env b/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/env/teamfortress2.env index 062c46d..004ee48 100644 --- a/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/env/teamfortress2.env +++ b/infrastructure/services/teamfortress2-server/teamfortress2-server/teamfortress2/env/teamfortress2.env @@ -3,6 +3,8 @@ SRCDS_PW=linuxmasterrace SRCDS_PORT=27015 SRCDS_MAXPLAYERS=32 SRCDS_REGION=3 -SRCDS_STARTMAP=pl_badwater +SRCDS_STARTMAP=pl_goldrush +#SRCDS_MAPCYCLE="mapcycle_default.txt" +#pl_badwater SRCDS_CFG=server.cfg -SRCDS_SECURED=0 \ No newline at end of file +SRCDS_SECURED=0