Merge branch 'ipv6' of git:librevpn into ipv6

2013-04-16 14:06:24 -03:00
parent 1af7928192 fa7f0a4cc6
commit c2f5a606bf
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -15,8 +15,8 @@ LVPN_HOSTS="${LVPN_HOSTS:-${LVPN_DIR}/hosts}"
 KEYSIZE=${KEYSIZE:-4096}

 # Subnets
-SUBNET="${SUBNET:-192.168.9.0/24}"
-SUBNET6="${SUBNET6:-2001:1291:200:83ab::/64}"
+LVPN_SUBNET="${SUBNET:-192.168.9.0/24}"
+LVPN_SUBNET6="${SUBNET6:-2001:1291:200:83ab::/64}"

 # Para gettext
 TEXTDOMAINDIR=${TEXTDOMAINDIR:-"/usr/share/locale"}
@ -25,7 +25,7 @@ TEXTDOMAIN="$(basename "${LVPN}")"
 export TINC NETWORK LVPN \
       LVPN_DIR LVPN_LIBDIR LVPN_HOSTS LVPN_BIN \
       KEYSIZE TEXTDOMAINDIR TEXTDOMAIN \
-       SUBNET SUBNET6
+       LVPN_SUBNET LVPN_SUBNET6

 . "${LVPN_LIBDIR}/common"