Commit e3464a00 authored by Guillaume Bury's avatar Guillaume Bury

Changed starting openvpn function for new script names

parent 410f51c4
...@@ -29,9 +29,9 @@ def server(ip, pipe_fd, *args, **kw): ...@@ -29,9 +29,9 @@ def server(ip, pipe_fd, *args, **kw):
return openvpn( return openvpn(
'--tls-server', '--tls-server',
'--mode', 'server', '--mode', 'server',
'--up', 'up-server %s/%u' % (ip, len(utils.config.vifibnet)), '--up', 'openvpn-up-server %s/%u' % (ip, len(utils.config.vifibnet)),
'--client-connect', 'client-connect ' + str(pipe_fd), '--client-connect', 'openvpn-server-events ' + str(pipe_fd),
'--client-disconnect', 'client-connect ' + str(pipe_fd), '--client-disconnect', 'openvpn-server-events ' + str(pipe_fd),
'--dh', utils.config.dh, '--dh', utils.config.dh,
'--max-clients', str(utils.config.max_clients), '--max-clients', str(utils.config.max_clients),
*args, **kw) *args, **kw)
...@@ -41,10 +41,10 @@ def client(serverIp, pipe_fd, *args, **kw): ...@@ -41,10 +41,10 @@ def client(serverIp, pipe_fd, *args, **kw):
'--nobind', '--nobind',
'--client', '--client',
'--remote', serverIp, '--remote', serverIp,
'--up', 'up-client', '--up', 'openvpn-up-client',
'--route-up', 'route-up ' + str(pipe_fd), '--route-up', 'openvpn-route-up ' + str(pipe_fd),
*args, **kw) *args, **kw)
def startBabel(**kw): def startBabel(**kw):
args = ['babeld', args = ['babeld',
'-C', 'redistribute local ip %s' % (utils.config.internal_ip), '-C', 'redistribute local ip %s' % (utils.config.internal_ip),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment