adjust ovpn template, adjust skip criteria
This commit is contained in:
@@ -114,14 +114,15 @@ if not os.path.exists(TEMP_OVPN_DIR):
|
|||||||
# Process each server
|
# Process each server
|
||||||
server_count = len(servers)
|
server_count = len(servers)
|
||||||
for index, server in enumerate(servers):
|
for index, server in enumerate(servers):
|
||||||
# Check if the server uses OpenVPN TCP Dedicated technology
|
# Check if the server uses OpenVPN TCP technology
|
||||||
technologies = server.get('technologies', [])
|
technologies = server.get('technologies', [])
|
||||||
skip_server = any(tech.get('identifier') == 'openvpn_dedicated_tcp' for tech in technologies)
|
has_openvpn_tcp = any(tech.get('identifier') == 'openvpn_tcp' for tech in technologies)
|
||||||
|
has_openvpn_dedicated_tcp = any(tech.get('identifier') == 'openvpn_dedicated_tcp' for tech in technologies)
|
||||||
technologies_str = ', '.join([t.get('identifier', 'N/A') for t in technologies]) # Get technologies as a string
|
technologies_str = ', '.join([t.get('identifier', 'N/A') for t in technologies]) # Get technologies as a string
|
||||||
|
|
||||||
if skip_server:
|
if not has_openvpn_tcp or has_openvpn_dedicated_tcp:
|
||||||
server_name = server.get('hostname')
|
server_name = server.get('hostname')
|
||||||
debug_print(f"{datetime.datetime.now()} [{index+1}/{server_count}] [{server_name}]: Skipping OpenVPN TCP Dedicated server. Technologies: {technologies_str}")
|
print(f"{datetime.datetime.now()} [{index+1}/{server_count}] [{server_name}]: Skipping server without OpenVPN TCP or with OpenVPN Dedicated TCP. Technologies: {technologies_str}")
|
||||||
continue # Skip to the next server
|
continue # Skip to the next server
|
||||||
|
|
||||||
server_name = server.get('hostname')
|
server_name = server.get('hostname')
|
||||||
|
|||||||
@@ -15,12 +15,13 @@ persist-tun
|
|||||||
connect-retry-max 1
|
connect-retry-max 1
|
||||||
reneg-sec 0
|
reneg-sec 0
|
||||||
comp-lzo no
|
comp-lzo no
|
||||||
|
data-ciphers AES-256-GCM:AES-128-GCM:CHACHA20-POLY1305
|
||||||
verify-x509-name CN={server_cn}
|
verify-x509-name CN={server_cn}
|
||||||
remote-cert-tls server
|
remote-cert-tls server
|
||||||
auth-user-pass
|
auth-user-pass
|
||||||
|
auth-nocache # Add auth-nocache here
|
||||||
verb 3
|
verb 3
|
||||||
pull
|
pull
|
||||||
cipher AES-256-CBC
|
|
||||||
auth SHA512
|
auth SHA512
|
||||||
<ca>
|
<ca>
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
|
|||||||
Reference in New Issue
Block a user