Merge branch 'develop' into 'master'

Develop



See merge request !6
master
Corné Oppelaar 8 years ago
commit b5174ef1f9

@ -21,7 +21,6 @@ key client.key
remote-cert-tls server remote-cert-tls server
cipher BF-CBC cipher AES-256-CBC
comp-lzo comp-lzo
verb 3

@ -19,7 +19,7 @@ push "redirect-gateway def1 bypass-dhcp"
push "dhcp-option DNS {{ server.getFirstDns() }}" push "dhcp-option DNS {{ server.getFirstDns() }}"
push "dhcp-option DNS {{ server.getSecondDns() }}" push "dhcp-option DNS {{ server.getSecondDns() }}"
keepalive 10 120 keepalive 10 120
cipher BF-CBC cipher AES-256-CBC
crl-verify crl.pem crl-verify crl.pem
@ -29,4 +29,6 @@ user nobody
group nogroup group nogroup
persist-key persist-key
persist-tun persist-tun
verb 0
Loading…
Cancel
Save