Skip to content

Commit dde3128

Browse files
committed
[openvpn] Differentiate server between manual, routed and bridged
1 parent c7e51c6 commit dde3128

File tree

6 files changed

+385
-120
lines changed

6 files changed

+385
-120
lines changed

netjsonconfig/backends/openvpn/openvpn.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ def auto_client(self, host, server, ca_path=None, ca_contents=None,
7474
c['proto'] = 'tcp-client'
7575
else:
7676
c['proto'] = 'udp'
77+
# determine if pull must be True
78+
if 'server' in server or 'server_bridge' in server:
79+
c['pull'] = True
7780
# tls_client
7881
if 'tls_server' not in server or not server['tls_server']:
7982
c['tls_client'] = False

netjsonconfig/backends/openvpn/renderers.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ def _transform_vpn(self, vpn):
2020
config = deepcopy(vpn)
2121
skip_keys = ['script_security', 'remote']
2222
delete_keys = []
23+
# allow server_bridge to be empty and still rendered
24+
if config.get('server_bridge') == '':
25+
config['server_bridge'] = True
2326
for key, value in config.items():
2427
if key in skip_keys:
2528
continue

0 commit comments

Comments
 (0)