Merge branch 'develop' into 'master'

Develop See merge request !6
2016-09-02 22:51:40 +02:00 · 2016-09-02 22:51:40 +02:00 · b5174ef1f9
commit b5174ef1f9
parent c0df1d3b31 3dce1a2d6a
2 changed files with 6 additions and 5 deletions
--- a/views/etc/openvpn-client.conf.twig
+++ b/views/etc/openvpn-client.conf.twig
@ -21,7 +21,6 @@ key client.key

 remote-cert-tls server

-cipher BF-CBC
+cipher AES-256-CBC

-comp-lzo
-verb 3
+comp-lzo
--- a/views/etc/openvpn-server.conf.twig
+++ b/views/etc/openvpn-server.conf.twig
@ -19,7 +19,7 @@ push "redirect-gateway def1 bypass-dhcp"
 push "dhcp-option DNS {{ server.getFirstDns() }}"
 push "dhcp-option DNS {{ server.getSecondDns() }}"
 keepalive 10 120
-cipher BF-CBC
+cipher AES-256-CBC

 crl-verify crl.pem

@ -29,4 +29,6 @@ user nobody
 group nogroup

 persist-key
-persist-tun
+persist-tun
+
+verb 0