Merge branch 'master' of https://git.oopen.de/firewall/ipt-gateway

conf/main_ipv4.conf.sample

@@ -202,6 +202,7 @@ six_pop_server=deham01.sixxs.net
 # ======
 
 # - VPN Service on Gateway?
+# -
 local_vpn_service=true
 vpn_gw_ports="1194 1195 1196"
 
@@ -222,6 +223,7 @@ declare -A vpn_server_dmz_arr
 # - Local VPN Ports
 # -
 # - Blank separated list
+# -
 vpn_local_net_ports="1194"
 
 
@@ -534,6 +536,7 @@ snmp_port="161"
 # - NOT YET IMPLEMENTED
 
 # - Mumble ports
+# -
 mumble_ports="64738"
 
 
@@ -547,7 +550,7 @@ local_xymon_server=false
 
 # - XyMon Service (usually TCP port 1984)
 # -
-# - Comma separated list of ip's
+# - Blank separated list of ip's
 # -
 xymon_server_ips=""
 local_xymon_client=""
@@ -754,6 +757,8 @@ brscan_port=54921
 # - Dont't foregt to add ip-adresses also to http(s) service if the
 # - systems provide webinterfaces!
 # -
+# - Blank seoarated list
+# -
 tele_sys_ips=""
 tele_sys_remote_sip_server_port=5060
 tele_sys_local_sip_server_port=5067
@@ -809,7 +814,9 @@ other_services=""
 # -
 # -    192.168.64.55: Repeater TP-Link TL-WA850RE
 # -
-masquerade_tcp_cons="192.168.63.0/24:192.168.64.55:80:${local_if_1}"
+# - Blank separated list
+# -
+masquerade_tcp_cons=""
 
 
 # =============
@@ -961,6 +968,8 @@ allow_remote_mac_src_addresses=""
 # -    61.160.0.0/16 - CHINANET-JS
 # -    116.8.0.0/14 CHINANET-GX
 # -
+# - Blank separated list
+# -
 blocked_ips="222.184.0.0/13 61.160.0.0/16 116.8.0.0/14"