From 836b473d20692bb24f9f62c5340572da381a0e0a Mon Sep 17 00:00:00 2001
From: Kyle Manna <kyle@kylemanna.com>
Date: Mon, 30 Jun 2014 22:56:26 -0700
Subject: [PATCH] ovpn: Remove reference to udp/1194

* Remove references to udp/1194.
* Works better with non-standard ports and tcp.
---
 bin/ovpn_genconfig | 6 +++---
 bin/ovpn_run       | 7 ++++++-
 bin/ovpn_status    | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bin/ovpn_genconfig b/bin/ovpn_genconfig
index 2c1b508..3bf1f4c 100755
--- a/bin/ovpn_genconfig
+++ b/bin/ovpn_genconfig
@@ -21,7 +21,7 @@ fi
 [ -z "$proto" ] && proto=1194
 [ -z "$port" ] && port=udp
 
-conf=$OPENVPN/udp1194.conf
+conf=$OPENVPN/openvpn.conf
 if [ -f "$conf" ]; then
     bak=$conf.$(date +%s).bak
     echo "Backing up $conf -> $bak"
@@ -49,6 +49,6 @@ route 192.168.254.0 255.255.255.0
 
 proto $proto
 port $port
-dev tun1194
-status /tmp/openvpn-status-1194.log
+dev tun0
+status /tmp/openvpn-status.log
 EOF
diff --git a/bin/ovpn_run b/bin/ovpn_run
index 77e0c21..4ff492f 100755
--- a/bin/ovpn_run
+++ b/bin/ovpn_run
@@ -20,4 +20,9 @@ iptables -t nat -A POSTROUTING -s 192.168.254.0/24 -o eth0 -j MASQUERADE
 # Dynamic subnet
 iptables -t nat -A POSTROUTING -s 192.168.255.0/24 -o eth0 -j MASQUERADE
 
-openvpn --config "$OPENVPN/udp1194.conf"
+conf="$OPENVPN/openvpn.conf"
+
+# TODO Remove after we stop caring about backwards compatibility
+[ ! -s "$conf" ] && conf="$OPENVPN/udp1194.conf"
+
+openvpn --config "$conf"
diff --git a/bin/ovpn_status b/bin/ovpn_status
index 40a915a..4e99e20 100755
--- a/bin/ovpn_status
+++ b/bin/ovpn_status
@@ -6,4 +6,4 @@
 
 set -ex
 
-tail -F /tmp/openvpn-status-1194.log
+tail -F /tmp/openvpn-status.log