arrstack: change VPN Provider ProtonVPN -> AirVPN

roles/alpina/collections/apps/arrstack/app_config.yml

@@ -1,13 +1,8 @@
 $ANSIBLE_VAULT;1.2;AES256;alpina
-63346463363535316637363430646637633164656432643064663166636233343766623539343466
-3362346266633930313332353836663633616366646135340a343461663237363031343563323630
-32373734383739376437373836613465636462313262356666616264383137643734373032326236
-6564393337346263660a663331303334653165383930653938356539663861646638343536383637
-33343962663965623131306365323265336564633866653639393930346132613664306631356237
-31323132383737383462386237343866303231396137383139316536373537373937616339333130
-39656332633730333462663931643366333131393466303031633439323234343234393062336262
-35383939343037393266333736396563666238633163316631326432353430616430663665313765
-35623064366632336635323236353837636562663161633837663564376266336433333733663533
-65656532663739613033653662386366616432333032303336663733346439616561626532303237
-61613231383435353532383232356434663735373463666430396336646637303964643563646532
-31613163633538653432
+66613933613334643836373939636238303035626535666161323634323837623565383337666232
+6166363839626433636231323434633164643033633466650a393032356231306436663563613734
+37316438306536316438383236373431333931373933323361623162323363623332333130653366
+6363616430353835620a366666303230313239393430326538346436626239663431316639633139
+33663261303864326162313235663536363332633731383636663165313061343863373333396536
+31336234306337393730343861636232643561356165393664633537623662353830613338363833
+306537353361653834656134383632306239

roles/alpina/collections/apps/arrstack/templates/.env.gluetun.j2

@@ -1,19 +1,31 @@
+## ProtonVPN OpenVPN
 #VPN_SERVICE_PROVIDER=protonvpn
 #OPENVPN_USER=+pmp
 #OPENVPN_PASSWORD=
 #SERVER_HOSTNAMES=node-us-160.protonvpn.net,node-us-161.protonvpn.net
 #VPN_PORT_FORWARDING=on
 
-VPN_SERVICE_PROVIDER=custom
+## ProtonVPN WireGuard
+#VPN_SERVICE_PROVIDER=custom
+#VPN_TYPE=wireguard
+#VPN_ENDPOINT_IP=
+#VPN_ENDPOINT_PORT=
+#WIREGUARD_PUBLIC_KEY=
+#WIREGUARD_PRIVATE_KEY=
+#WIREGUARD_PRESHARED_KEY=
+#WIREGUARD_ADDRESSES=
+#VPN_DNS_ADDRESS=
+#VPN_PORT_FORWARDING=on
+#VPN_PORT_FORWARDING_PROVIDER=protonvpn
+
+## AirVPN
+VPN_SERVICE_PROVIDER=airvpn
 VPN_TYPE=wireguard
-VPN_ENDPOINT_IP={{ wg_peer_ip }}
-VPN_ENDPOINT_PORT={{ wg_peer_port }}
+SERVER_CITIES=Los Angeles
 WIREGUARD_PUBLIC_KEY={{ wg_peer_pubkey }}
 WIREGUARD_PRIVATE_KEY={{ wg_privkey }}
-WIREGUARD_PRESHARED_KEY=
-WIREGUARD_ADDRESSES={{ wg_address }}
-VPN_DNS_ADDRESS={{ wg_dns }}
-VPN_PORT_FORWARDING=on
-VPN_PORT_FORWARDING_PROVIDER=protonvpn
+WIREGUARD_PRESHARED_KEY={{ wg_psk }}
+WIREGUARD_ADDRESSES={{ wg_addresses }}
+FIREWALL_VPN_INPUT_PORTS={{ fw_vpn_input_ports }}
 
-#FIREWALL_OUTBOUND_SUBNETS=192.168.144.0/24
+#FIREWALL_OUTBOUND_SUBNETS=10.0.0.0/8,{{ docker_ipv6_subnet }}

roles/alpina/collections/apps/arrstack/templates/docker-compose.yml.j2

@@ -38,25 +38,6 @@ services:
       - {{ media_volume_path }}/Plex:/media/Plex
       - {{ media_volume_path }}/iso-img:/media/iso-img
 
-  {#  https://github.com/qdm12/gluetun/issues/1488#issuecomment-1489597284  -#}
-  {#  Even though it should work without this, there is no way to manually set the router in qbittorrent.  -#}
-  {#  So you get 'UPnP/NAT-PMP port mapping failed. Message: "could not map port using UPnP[10.2.0.2]: no router found"'  -#}
-  qbittorrent_natmap:
-    container_name: qbittorrent_natmap
-    image: ghcr.io/soxfor/qbittorrent-natmap:latest
-    restart: unless-stopped
-    environment:
-      - QBITTORRENT_SERVER=10.2.0.2
-      - VPN_GATEWAY=10.2.0.1
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    network_mode: "service:gluetun"
-    depends_on:
-      gluetun:
-        condition: service_healthy
-      qbittorrent:
-        condition: service_started
-
   prowlarr:
     image: linuxserver/prowlarr:latest
     container_name: prowlarr