diff options
| author | root@culturestrings <root@culturestrings> | 2020-07-01 09:16:56 +0000 |
|---|---|---|
| committer | root@culturestrings <root@culturestrings> | 2020-07-01 09:16:56 +0000 |
| commit | a75d12f964f0d3b77d041ef310c991631097ff0e (patch) | |
| tree | 0c1b3d509beacd6606bd645019530b22a2250334 | |
| parent | 2487cfaaf383e1b93b3c33adfec8108ae335d921 (diff) | |
| download | culturestrings-a75d12f964f0d3b77d041ef310c991631097ff0e.tar.bz2 culturestrings-a75d12f964f0d3b77d041ef310c991631097ff0e.tar.xz | |
openvpn: added $vpn_route_all support (yes/no).
| -rwxr-xr-x | public/fs/etc/openvpn/hostvpn-conf.sh | 7 | ||||
| -rw-r--r-- | public/fs/etc/openvpn/hostvpn.conf.in | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/public/fs/etc/openvpn/hostvpn-conf.sh b/public/fs/etc/openvpn/hostvpn-conf.sh index a438a54..24cb390 100755 --- a/public/fs/etc/openvpn/hostvpn-conf.sh +++ b/public/fs/etc/openvpn/hostvpn-conf.sh @@ -10,10 +10,17 @@ cfg_srcdir=$(cd -- "${cfg_script%/*}/" ; pwd -P) source /root/config/private/config/server.ports source /root/config/private/config/hostinfo/${sitezone} +if [ ${vpn_route_all} = 'yes' ]; then + vpn_route_all_subst='s/^@vpn_route_all@ //g' +else + vpn_route_all_subst='/^@vpn_route_all@ /d' +fi + sed -e 's/@vpn_port@/'${vpn_port}'/g' \ -e 's/@hostname@/'${hostname}'/g' \ -e 's/@vpn_net4@/'${vpn_net4}'/g' \ -e 's/@vpn_ipv4@/'${vpn_ipv4}'/g' \ -e 's/@host_ipv4@/'${host_ipv4}'/g' \ -e 's/@host_ipv6@/'${host_ipv6}'/g' \ + -e "${vpn_route_all_subst}" \ "${cfg_srcdir}/hostvpn.conf.in" diff --git a/public/fs/etc/openvpn/hostvpn.conf.in b/public/fs/etc/openvpn/hostvpn.conf.in index 59f7684..fb85982 100644 --- a/public/fs/etc/openvpn/hostvpn.conf.in +++ b/public/fs/etc/openvpn/hostvpn.conf.in @@ -23,9 +23,9 @@ push "route-ipv6 2000::/3" push "route-ipv6 host_ipv6::/64" push "route 192.168.0.0 255.255.255.0" -push "block-outside-dns" -push "redirect-gateway def1" -push "dhcp-option DNS @vpn_ipv4@" +@vpn_route_all@ push "block-outside-dns" +@vpn_route_all@ push "redirect-gateway def1" +@vpn_route_all@ push "dhcp-option DNS @vpn_ipv4@" duplicate-cn client-to-client |