From fe83e0fe2736965b08bf366d8b7db8462a910342 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Sun, 26 Apr 2026 15:38:16 -0400 Subject: [PATCH 1/2] [FA-misc] Swaps out openvpn container for ExpressVPN --- Documentation/README.md | 3 +++ docker-compose.yml | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Documentation/README.md b/Documentation/README.md index 1b80ddb..1a24f62 100644 --- a/Documentation/README.md +++ b/Documentation/README.md @@ -95,6 +95,9 @@ NOVELPIA_USERNAME=your-username NOVELPIA_PASSWORD=your-password DEEPL_API_KEY=your-api-key +# ExpressVPN (used by the `vpn` container that tunnels novel-service into Korea) +EXPRESSVPN_ACTIVATION_CODE=your-expressvpn-activation-code + # S3 Storage S3_ENDPOINT=https://s3.example.com S3_BUCKET=fictionarchive diff --git a/docker-compose.yml b/docker-compose.yml index 161541f..970e9a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: # VPN Container # =========================================== vpn: - image: dperson/openvpn-client + image: misioslav/expressvpn:latest networks: fictionarchive: ipv4_address: 172.20.0.20 @@ -51,23 +51,25 @@ services: - novel-service cap_add: - NET_ADMIN + - SYS_PTRACE devices: - /dev/net/tun - volumes: - - /srv/docker_volumes/korean_vpn:/vpn - dns: - - 192.168.3.1 environment: - - DNS=1.1.1.1,8.8.8.8 + CODE: ${EXPRESSVPN_ACTIVATION_CODE} + SERVER: krsi + PROTOCOL: lightwayudp + WHITELIST_DNS: 1.1.1.1,8.8.8.8 + CONNECTION_CHECK_INTERVAL: 30 + RECONNECT_FAILURE_THRESHOLD: 3 extra_hosts: - "postgres:172.20.0.10" - "rabbitmq:172.20.0.11" healthcheck: - test: ["CMD", "ping", "-c", "1", "-W", "5", "1.1.1.1"] + test: ["CMD-SHELL", "test ! -f /tmp/expressvpn/reconnect-failure.flag && expressvpnctl status | grep -q Connected"] interval: 30s timeout: 10s retries: 3 - start_period: 30s + start_period: 60s restart: unless-stopped # =========================================== From a056ca42eec94112d54403ce74f8f8c89d53fef9 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Sun, 26 Apr 2026 16:11:13 -0400 Subject: [PATCH 2/2] [FA-misc] Hopefully fix build issues --- FictionArchive.API/build_gateway.py | 1 + .../FictionArchive.Service.NovelService.Tests.csproj | 2 +- .../FictionArchive.Service.ReportingService.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FictionArchive.API/build_gateway.py b/FictionArchive.API/build_gateway.py index a345342..796746c 100644 --- a/FictionArchive.API/build_gateway.py +++ b/FictionArchive.API/build_gateway.py @@ -98,6 +98,7 @@ for svc in selected_services: # Export schema run([ "dotnet", "run", + "-c", "Release", "--no-build", "--no-launch-profile", "--", diff --git a/FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj b/FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj index 5bf6a8c..47dc7c4 100644 --- a/FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj +++ b/FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj b/FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj index 81228be..497239c 100644 --- a/FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj +++ b/FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj @@ -9,7 +9,7 @@ - +