diff options
| author | root@culturestrings <root@culturestrings> | 2020-07-01 08:57:05 +0000 |
|---|---|---|
| committer | root@culturestrings <root@culturestrings> | 2020-07-01 08:57:05 +0000 |
| commit | 2caf08d5dd9d82087c16390a34e8ab169be75369 (patch) | |
| tree | 93f726587321c6e03fd86f74088e57dbbc2a1292 /public/fs/etc/openvpn | |
| parent | 065c23e1561fad50c66c30447a4886d2727a47cf (diff) | |
| download | culturestrings-2caf08d5dd9d82087c16390a34e8ab169be75369.tar.bz2 culturestrings-2caf08d5dd9d82087c16390a34e8ab169be75369.tar.xz | |
networking: introduced $vpn_net4, $vpn_ipv5, $host_ipv4, $host_ipv6.
Diffstat (limited to 'public/fs/etc/openvpn')
| -rwxr-xr-x | public/fs/etc/openvpn/hostvpn-conf.sh | 4 | ||||
| -rw-r--r-- | public/fs/etc/openvpn/hostvpn.conf.in | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/public/fs/etc/openvpn/hostvpn-conf.sh b/public/fs/etc/openvpn/hostvpn-conf.sh index cdfdb1c..a438a54 100755 --- a/public/fs/etc/openvpn/hostvpn-conf.sh +++ b/public/fs/etc/openvpn/hostvpn-conf.sh @@ -12,4 +12,8 @@ source /root/config/private/config/hostinfo/${sitezone} 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' \ "${cfg_srcdir}/hostvpn.conf.in" diff --git a/public/fs/etc/openvpn/hostvpn.conf.in b/public/fs/etc/openvpn/hostvpn.conf.in index a285e12..bf58a4f 100644 --- a/public/fs/etc/openvpn/hostvpn.conf.in +++ b/public/fs/etc/openvpn/hostvpn.conf.in @@ -16,16 +16,16 @@ dh /etc/easy-rsa/pki/dh.pem status /var/log/openvpn/openvpn-status.log log-append /var/log/openvpn/openvpn.log -server 10.8.0.0 255.255.255.0 -server-ipv6 2a01:4f9:2b:20f0:8000::/65 +server @vpn_net4@ 255.255.255.0 +server-ipv6 @host_ipv6@:8000::/65 push "route-ipv6 2000::/3" -push "route-ipv6 2a01:4f9:2b:20f0::/64" +push "route-ipv6 host_ipv6::/64" push "block-outside-dns" push "redirect-gateway def1" push "route 192.168.0.0 255.255.255.0" -push "dhcp-option DNS 10.8.0.1" +push "dhcp-option DNS @vpn_ipv4@" duplicate-cn client-to-client |