From b15b1fca40adfcf5cb89ae8d1d92efb2e3bf1ee7 Mon Sep 17 00:00:00 2001
From: Iurii Tatishchev <itatishch@gmail.com>
Date: Wed, 15 Nov 2023 14:50:11 -0800
Subject: [PATCH] arrstack: minor gluetun setup fixes

---
 .../alpina/collections/apps/arrstack/templates/.env.gluetun.j2 | 2 +-
 .../collections/apps/arrstack/templates/docker-compose.yml.j2  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/alpina/collections/apps/arrstack/templates/.env.gluetun.j2 b/roles/alpina/collections/apps/arrstack/templates/.env.gluetun.j2
index a777884..8ddf5ec 100644
--- a/roles/alpina/collections/apps/arrstack/templates/.env.gluetun.j2
+++ b/roles/alpina/collections/apps/arrstack/templates/.env.gluetun.j2
@@ -21,7 +21,7 @@
 ## AirVPN
 VPN_SERVICE_PROVIDER=airvpn
 VPN_TYPE=wireguard
-SERVER_CITIES=Los Angeles
+SERVER_COUNTRIES=United States
 WIREGUARD_PUBLIC_KEY={{ wg_peer_pubkey }}
 WIREGUARD_PRIVATE_KEY={{ wg_privkey }}
 WIREGUARD_PRESHARED_KEY={{ wg_psk }}
diff --git a/roles/alpina/collections/apps/arrstack/templates/docker-compose.yml.j2 b/roles/alpina/collections/apps/arrstack/templates/docker-compose.yml.j2
index 551c449..e875d4c 100644
--- a/roles/alpina/collections/apps/arrstack/templates/docker-compose.yml.j2
+++ b/roles/alpina/collections/apps/arrstack/templates/docker-compose.yml.j2
@@ -37,6 +37,9 @@ services:
       - {{ base_volume_path }}/arrstack/downloads:/downloads
       - {{ media_volume_path }}/Plex:/media/Plex
       - {{ media_volume_path }}/iso-img:/media/iso-img
+    depends_on:
+      gluetun:
+        condition: service_healthy
 
   prowlarr:
     image: linuxserver/prowlarr:latest