From dbe3419dfad1de66e3391c6e4ff0c351e990da05 Mon Sep 17 00:00:00 2001
From: Marc Runkel <marc@runkel.org>
Date: Sat, 27 Jun 2020 12:28:03 +0200
Subject: [PATCH] Update OVPN configs (plus a small bonus bugfix) (#1265)

* Fix error message when $PUID is set and $PGID isn't set.

* Update hostnames for OVPN

Co-authored-by: Marc Runkel <marc.runkel@plusforta.de>
---
 openvpn/ovpn/Germany.ovpn | 4 ++--
 openvpn/ovpn/Sweden.ovpn  | 4 ++--
 openvpn/ovpn/US.ovpn      | 4 ++--
 transmission/userSetup.sh | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openvpn/ovpn/Germany.ovpn b/openvpn/ovpn/Germany.ovpn
index e9fa3aef6..ffac81812 100644
--- a/openvpn/ovpn/Germany.ovpn
+++ b/openvpn/ovpn/Germany.ovpn
@@ -1,8 +1,8 @@
 client
 dev tun
 proto udp
-remote pool.prd.de.ovpn.se 1194
-remote pool.prd.de.ovpn.se 1195
+remote pool-1.prd.de.ovpn.com 1194
+remote pool-1.prd.de.ovpn.com 1195
 remote-random
 remote-cert-tls server
 cipher AES-256-CBC
diff --git a/openvpn/ovpn/Sweden.ovpn b/openvpn/ovpn/Sweden.ovpn
index 1a1c14392..c719711b8 100644
--- a/openvpn/ovpn/Sweden.ovpn
+++ b/openvpn/ovpn/Sweden.ovpn
@@ -1,8 +1,8 @@
 client
 dev tun
 proto udp
-remote pool.prd.se.ovpn.se 1194
-remote pool.prd.se.ovpn.se 1195
+remote pool-1.prd.se.ovpn.se 1194
+remote pool-1.prd.se.ovpn.se 1195
 remote-random
 remote-cert-tls server
 cipher AES-256-CBC
diff --git a/openvpn/ovpn/US.ovpn b/openvpn/ovpn/US.ovpn
index 381112c4d..425b49dd0 100644
--- a/openvpn/ovpn/US.ovpn
+++ b/openvpn/ovpn/US.ovpn
@@ -1,8 +1,8 @@
 client
 dev tun
 proto udp
-remote pool.prd.us.ovpn.com 1194 # resolves to multiple VPN servers in location
-remote pool.prd.us.ovpn.com 1195 # resolves to multiple VPN servers in location
+remote pool-1.prd.us.ovpn.com 1194 # resolves to multiple VPN servers in location
+remote pool-1.prd.us.ovpn.com 1195 # resolves to multiple VPN servers in location
 remote-random
 remote-cert-tls server
 cipher AES-256-CBC
diff --git a/transmission/userSetup.sh b/transmission/userSetup.sh
index b3c3557a8..e645abb74 100644
--- a/transmission/userSetup.sh
+++ b/transmission/userSetup.sh
@@ -9,7 +9,7 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
     if [ ! "$(id -u ${RUN_AS})" -eq "$PUID" ]; then
         usermod -o -u "$PUID" ${RUN_AS};
     fi
-    if [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then
+    if [ -n "$PGID" ] && [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then
         groupmod -o -g "$PGID" ${RUN_AS};
     fi