[Astlinux-commits] SF.net SVN: astlinux:[5950] branches/1.0

[<abe...@us...>]

Revision: 5950
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5950&view=rev
Author:   abelbeck
Date:     2013-02-11 18:57:48 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
openvpn, add new optional variables OVPN_SERVERV6 and OVPN_TOPOLOGY for OpenVPN 2.3 IPv6 support

Modified Paths:
--------------
    branches/1.0/package/openvpn/openvpn.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init	2013-02-11 15:28:45 UTC (rev 5949)
+++ branches/1.0/package/openvpn/openvpn.init	2013-02-11 18:57:48 UTC (rev 5950)
@@ -53,7 +53,8 @@
 cert $OVPN_CERT
 key $OVPN_KEY
 dh $OVPN_DH
-server $OVPN_SERVER
+server $OVPN_SERVER${OVPN_SERVERV6:+
+server-ipv6 $OVPN_SERVERV6}
 verb $OVPN_VERBOSITY" > /tmp/etc/openvpn.conf
     # push settings from the server to the client
     if [ -n "$OVPN_PUSH1" ]; then
@@ -95,6 +96,9 @@
     if [ -n "$OVPN_CIPHER" ]; then
       echo "cipher $OVPN_CIPHER" >> /tmp/etc/openvpn.conf
     fi
+    if [ -n "$OVPN_TOPOLOGY" ]; then
+      echo "topology $OVPN_TOPOLOGY" >> /tmp/etc/openvpn.conf
+    fi
     if [ -n "$OVPN_VALIDCLIENTS" ]; then
       echo "tls-verify /usr/sbin/openvpn-tls-verify" >> /tmp/etc/openvpn.conf
     fi

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-02-11 15:28:45 UTC (rev 5949)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-02-11 18:57:48 UTC (rev 5950)
@@ -492,25 +492,18 @@
 #OVPN_KEY="/etc/openvpn/easy-rsa/keys/server.key"
 #OVPN_DH="/etc/openvpn/easy-rsa/keys/dh1024.pem"
 #OVPN_SERVER="10.8.0.0 255.255.255.0"
+#OVPN_SERVERV6="2001:db8:108::1/64"  # valid OVPN_SERVER also required if defined
+#OVPN_TOPOLOGY="subnet"              # "net30", "p2p" or "subnet", defaults to OpenVPN default
 #OVPN_VERBOSITY="1"
-#OVPN_CERT_KEYSIZE="1024"      # "1024" or "2048", defaults to "1024"
+#OVPN_CERT_KEYSIZE="1024"            # "1024" or "2048", defaults to "1024"
 ##
-#OVPN_PUSH1="route 192.168.0.0 255.255.255.0"
-#OVPN_PUSH2=""
-#OVPN_PUSH3=""
-#OVPN_PUSH4=""
-## Deprecate OVPN_PUSH1-4 in favor of OVPN_PUSH
 #OVPN_PUSH="
 #dhcp-option DOMAIN astlinux
 #dhcp-option DNS 192.168.101.1
 #route 192.168.101.0 255.255.255.0
 #"
 ##
-#OVPN_OTHER1=""
-#OVPN_OTHER2=""
-## Deprecate OVPN_OTHER1-2 in favor of OVPN_OTHER
 #OVPN_OTHER="
-#ifconfig-pool-linear
 #client-to-client
 #"
 ##

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.