Merge branch 'develop'

Author: SloCompTech

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.0.6 - Bugfix
+
+- Added missing `DNS` keyword to **dhcp-option** in example configs
+- Removed `ping` from client config in examples, because `keepalive` is set on a server
+
 ### 1.0.5 - Bugfix, finish hook, persistent interface, no firewall ...
 
 - Fixed bug when running hooks (#3)

README.md

@@ -71,7 +71,7 @@ services:
 |`-e PUID=1000`|for UserID - see below for explanation|
 |`-e PGID=1000`|for GroupID - see below for explanation|
 |`-e OVPN_NFW=true`|Disable any firewall related rules to be created, modified ... (must be implemented in example)|
-|`-e OVPN_PERINT=false`|Disable persistent TUN interface|
+|`-e OVPN_PERINT=true`|Enable persistent TUN interface|
 |`-v /config`|All the config files including OpenVPNs reside here|
 
 See also: [EasyRSA](https://github.com/OpenVPN/easy-rsa/blob/master/doc/EasyRSA-Advanced.md)  

root/defaults/example/config/basic_nat/client/client.conf

@@ -27,7 +27,6 @@ cipher AES-256-GCM
 # Additional settings
 compress lzo
 verb 3
-ping 10 120
 
 # Permissions
 user nobody

root/defaults/example/config/basic_nat/server/server.conf

@@ -14,8 +14,8 @@ topology subnet
 server $NETWORK_ADDRESS 255.255.255.0
 
 push "redirect-gateway def1 bypass-dhcp"
-push "dhcp-option $DNS1"
-push "dhcp-option $DNS2"
+push "dhcp-option DNS $DNS1"
+push "dhcp-option DNS $DNS2"
 
 ifconfig-pool-persist tmp/ipp.txt
 

root/defaults/example/config/basic_nat_wlp/client/client.conf

@@ -27,7 +27,6 @@ cipher AES-256-GCM
 # Additional settings
 compress lzo
 verb 3
-ping 10 120
 
 # Permissions
 user nobody

root/defaults/example/config/basic_nat_wlp/server/server.conf

@@ -14,8 +14,8 @@ topology subnet
 server $NETWORK_ADDRESS 255.255.255.0
 
 push "redirect-gateway def1 bypass-dhcp"
-push "dhcp-option $DNS1"
-push "dhcp-option $DNS2"
+push "dhcp-option DNS $DNS1"
+push "dhcp-option DNS $DNS2"
 
 ifconfig-pool-persist tmp/ipp.txt
 

root/defaults/example/config/basic_routed/client/client.conf

@@ -27,7 +27,6 @@ cipher AES-256-GCM
 # Additional settings
 compress lzo
 verb 3
-ping 10 120
 
 # Permissions
 user nobody

root/defaults/example/config/basic_routed/server/server.conf

@@ -14,8 +14,8 @@ topology subnet
 server $NETWORK_ADDRESS 255.255.255.0
 
 push "redirect-gateway def1 bypass-dhcp"
-push "dhcp-option $DNS1"
-push "dhcp-option $DNS2"
+push "dhcp-option DNS $DNS1"
+push "dhcp-option DNS $DNS2"
 
 ifconfig-pool-persist tmp/ipp.txt