From 00d63eebd6319d244cfcb8398f68e819303389de Mon Sep 17 00:00:00 2001
From: b3nw <admin@ben.io>
Date: Thu, 12 Sep 2024 19:59:25 -0500
Subject: [PATCH] adjust vpn config, adjust retry config

---
 nord-checker.py    | 5 ++---
 openvpn_manager.py | 3 +--
 ovpn_template.py   | 7 ++-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/nord-checker.py b/nord-checker.py
index 49e5fe7..f92a015 100644
--- a/nord-checker.py
+++ b/nord-checker.py
@@ -143,7 +143,7 @@ for index, server in enumerate(servers):
     with open(ovpn_filepath, "w") as f:
         f.write(DEFAULT_OVPN_CONFIG.format(server_ip=server_ip, server_cn=server_name))
 
-    # Establish VPN connection
+# Establish VPN connection
     connection_successful, connection_message = establish_vpn_connection(
         ovpn_filepath, CREDENTIAL_FILE, LOG_FILE, debug_print=debug_print
     )
@@ -169,8 +169,7 @@ for index, server in enumerate(servers):
         except subprocess.CalledProcessError:
             print(f"{datetime.datetime.now()} [{index+1}/{server_count}] [{server_name}]: VPN connection failed to establish.")
     else:
-        print(f"{datetime.datetime.now()} [{index+1}/{server_count}] [{server_name}]: Error starting OpenVPN connection: {connection_message}")
-
+            print(f"{datetime.datetime.now()} [{index+1}/{server_count}] [{server_name}]: Error starting OpenVPN connection: {connection_message}")
     # Disconnect VPN
     disconnect_vpn()
     print(f"{datetime.datetime.now()} [{index+1}/{server_count}] [{server_name}]: VPN disconnected.")
diff --git a/openvpn_manager.py b/openvpn_manager.py
index 67ae26f..0181e81 100644
--- a/openvpn_manager.py
+++ b/openvpn_manager.py
@@ -17,8 +17,7 @@ def establish_vpn_connection(ovpn_file, credential_file, log_file, debug_print=N
 
     # Establish VPN connection (capture stdout and stderr)
     openvpn_command = ["/usr/sbin/openvpn", "--config", ovpn_file,
-                       "--auth-user-pass", credential_file,
-                       "--verb", "1"]
+    "--auth-user-pass", credential_file, "--verb", "1"]
 
     if debug_print:
         debug_print(f"OpenVPN command: {' '.join(openvpn_command)}")  # Debug print
diff --git a/ovpn_template.py b/ovpn_template.py
index 87570ce..def5a19 100644
--- a/ovpn_template.py
+++ b/ovpn_template.py
@@ -4,7 +4,7 @@ client
 dev tun
 proto tcp
 remote {server_ip} 443
-resolv-retry infinite
+resolv-retry 3
 remote-random
 nobind
 tun-mtu 1500
@@ -12,9 +12,7 @@ tun-mtu-extra 32
 mssfix 1450
 persist-key
 persist-tun
-ping 15
-ping-restart 0
-ping-timer-rem
+connect-retry-max 1
 reneg-sec 0
 comp-lzo no
 verify-x509-name CN={server_cn}
@@ -22,7 +20,6 @@ remote-cert-tls server
 auth-user-pass
 verb 3
 pull
-fast-io
 cipher AES-256-CBC
 auth SHA512
 <ca>