Merge pull request '[FA-misc] Swaps out openvpn container for ExpressVPN' (#70 ) from feature/FA-misc_VPNSwitch into master

Reviewed-on: #70
[FA-misc] Hopefully fix build issues
2026-04-26 20:18:28 +00:00 · 2026-04-26 16:11:13 -04:00 · 2026-04-26 15:38:16 -04:00 · 2026-02-02 00:08:37 +00:00
5 changed files with 16 additions and 10 deletions
--- 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
--- 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",
        "--",
--- a/FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj
+++ b/FictionArchive.Service.NovelService.Tests/FictionArchive.Service.NovelService.Tests.csproj
@@ -9,7 +9,7 @@

  <ItemGroup>
    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="MassTransit" Version="8.5.7" />
+    <PackageReference Include="MassTransit" Version="8.5.9" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
    <PackageReference Include="NodaTime.Testing" Version="3.3.0" />
--- a/FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj
+++ b/FictionArchive.Service.ReportingService.Tests/FictionArchive.Service.ReportingService.Tests.csproj
@@ -9,7 +9,7 @@

  <ItemGroup>
    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="MassTransit" Version="8.5.7" />
+    <PackageReference Include="MassTransit" Version="8.5.9" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
    <PackageReference Include="NodaTime.Testing" Version="3.3.0" />
--- 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

  # ===========================================
Author	SHA1	Message	Date
conco	3308bc9d49	Merge pull request '[FA-misc] Swaps out openvpn container for ExpressVPN' (#70 ) from feature/FA-misc_VPNSwitch into master All checks were successful CI / build-backend (push) Successful in 1m35s Details CI / build-frontend (push) Successful in 49s Details Build Gateway / build-subgraphs (map[name:novel-service project:FictionArchive.Service.NovelService subgraph:Novel]) (push) Successful in 1m1s Details Build Gateway / build-subgraphs (map[name:reporting-service project:FictionArchive.Service.ReportingService subgraph:Reporting]) (push) Successful in 49s Details Build Gateway / build-subgraphs (map[name:scheduler-service project:FictionArchive.Service.SchedulerService subgraph:Scheduler]) (push) Successful in 52s Details Build Gateway / build-subgraphs (map[name:translation-service project:FictionArchive.Service.TranslationService subgraph:Translation]) (push) Successful in 1m1s Details Build Gateway / build-subgraphs (map[name:user-service project:FictionArchive.Service.UserService subgraph:User]) (push) Successful in 56s Details Build Gateway / build-subgraphs (map[name:usernoveldata-service project:FictionArchive.Service.UserNovelDataService subgraph:UserNovelData]) (push) Successful in 1m5s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.FileService/Dockerfile name:file-service]) (push) Successful in 3m0s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.NovelService/Dockerfile name:novel-service]) (push) Successful in 2m9s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.ReportingService/Dockerfile name:reporting-service]) (push) Successful in 1m49s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.SchedulerService/Dockerfile name:scheduler-service]) (push) Successful in 2m0s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.TranslationService/Dockerfile name:translation-service]) (push) Successful in 1m55s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.UserNovelDataService/Dockerfile name:usernoveldata-service]) (push) Successful in 1m47s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.UserService/Dockerfile name:user-service]) (push) Successful in 1m53s Details Release / build-frontend (push) Successful in 1m56s Details Build Gateway / build-gateway (push) Successful in 4m10s Details Reviewed-on: #70	2026-04-26 20:18:28 +00:00
gamer147	a056ca42ee	[FA-misc] Hopefully fix build issues All checks were successful CI / build-backend (pull_request) Successful in 1m54s Details CI / build-frontend (pull_request) Successful in 54s Details	2026-04-26 16:11:13 -04:00
gamer147	fe83e0fe27	[FA-misc] Swaps out openvpn container for ExpressVPN Some checks failed CI / build-backend (pull_request) Failing after 2m11s Details CI / build-frontend (pull_request) Successful in 55s Details	2026-04-26 15:38:16 -04:00
conco	327c03c098	Merge pull request '[FA-misc] Delete novel now authorizes based on group' (#65 ) from feature/FA-misc_GroupBasedAuth into master All checks were successful CI / build-backend (push) Successful in 1m9s Details CI / build-frontend (push) Successful in 42s Details Build Gateway / build-subgraphs (map[name:novel-service project:FictionArchive.Service.NovelService subgraph:Novel]) (push) Successful in 51s Details Build Gateway / build-subgraphs (map[name:reporting-service project:FictionArchive.Service.ReportingService subgraph:Reporting]) (push) Successful in 45s Details Build Gateway / build-subgraphs (map[name:scheduler-service project:FictionArchive.Service.SchedulerService subgraph:Scheduler]) (push) Successful in 44s Details Build Gateway / build-subgraphs (map[name:translation-service project:FictionArchive.Service.TranslationService subgraph:Translation]) (push) Successful in 46s Details Build Gateway / build-subgraphs (map[name:user-service project:FictionArchive.Service.UserService subgraph:User]) (push) Successful in 46s Details Build Gateway / build-subgraphs (map[name:usernoveldata-service project:FictionArchive.Service.UserNovelDataService subgraph:UserNovelData]) (push) Successful in 45s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.FileService/Dockerfile name:file-service]) (push) Successful in 2m5s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.NovelService/Dockerfile name:novel-service]) (push) Successful in 2m1s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.ReportingService/Dockerfile name:reporting-service]) (push) Successful in 1m44s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.SchedulerService/Dockerfile name:scheduler-service]) (push) Successful in 1m53s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.TranslationService/Dockerfile name:translation-service]) (push) Successful in 1m46s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.UserNovelDataService/Dockerfile name:usernoveldata-service]) (push) Successful in 1m43s Details Release / build-and-push (map[dockerfile:FictionArchive.Service.UserService/Dockerfile name:user-service]) (push) Successful in 1m39s Details Release / build-frontend (push) Successful in 1m43s Details Build Gateway / build-gateway (push) Successful in 3m33s Details Reviewed-on: #65	2026-02-02 00:08:37 +00:00