mirror of
https://github.com/pivpn/pivpn.git
synced 2024-12-18 19:00:15 +00:00
support pivpnNET from setupVARs.conf
This commit is contained in:
parent
805de5f77f
commit
d3e009d171
3 changed files with 10 additions and 2 deletions
|
@ -1063,7 +1063,10 @@ installPiVPN(){
|
||||||
if [ "$VPN" = "openvpn" ]; then
|
if [ "$VPN" = "openvpn" ]; then
|
||||||
|
|
||||||
pivpnDEV="tun0"
|
pivpnDEV="tun0"
|
||||||
|
# Allow custom NET via unattend setupVARs file. Use default if not provided.
|
||||||
|
if [ -z "$pivpnNET" ]; then
|
||||||
pivpnNET="10.8.0.0"
|
pivpnNET="10.8.0.0"
|
||||||
|
fi
|
||||||
vpnGw="${pivpnNET/.0.0/.0.1}"
|
vpnGw="${pivpnNET/.0.0/.0.1}"
|
||||||
|
|
||||||
askAboutCustomizing
|
askAboutCustomizing
|
||||||
|
@ -1085,7 +1088,10 @@ installPiVPN(){
|
||||||
# set the protocol here.
|
# set the protocol here.
|
||||||
pivpnPROTO="udp"
|
pivpnPROTO="udp"
|
||||||
pivpnDEV="wg0"
|
pivpnDEV="wg0"
|
||||||
|
# Allow custom NET via unattend setupVARs file. Use default if not provided.
|
||||||
|
if [ -z "$pivpnNET" ]; then
|
||||||
pivpnNET="10.6.0.0"
|
pivpnNET="10.6.0.0"
|
||||||
|
fi
|
||||||
vpnGw="${pivpnNET/.0.0/.0.1}"
|
vpnGw="${pivpnNET/.0.0/.0.1}"
|
||||||
# Forward all traffic through PiVPN (i.e. full-tunnel), may be modified by
|
# Forward all traffic through PiVPN (i.e. full-tunnel), may be modified by
|
||||||
# the user after the installation.
|
# the user after the installation.
|
||||||
|
|
|
@ -4,6 +4,7 @@ IPv4gw=192.168.23.1
|
||||||
dhcpReserv=0
|
dhcpReserv=0
|
||||||
install_user=pi
|
install_user=pi
|
||||||
VPN=openvpn
|
VPN=openvpn
|
||||||
|
pivpnNET=10.8.0.0
|
||||||
subnetClass=24
|
subnetClass=24
|
||||||
pivpnPROTO=udp
|
pivpnPROTO=udp
|
||||||
pivpnPORT=1194
|
pivpnPORT=1194
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
IPv4dev=eth0
|
IPv4dev=eth0
|
||||||
install_user=pi
|
install_user=pi
|
||||||
VPN=wireguard
|
VPN=wireguard
|
||||||
|
pivpnNET=10.6.0.0
|
||||||
subnetClass=24
|
subnetClass=24
|
||||||
pivpnPORT=51820
|
pivpnPORT=51820
|
||||||
pivpnDNS1=9.9.9.9
|
pivpnDNS1=9.9.9.9
|
||||||
|
|
Loading…
Reference in a new issue