[FA-misc] Swaps out openvpn container for ExpressVPN

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

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
 
   # ===========================================