Separate vpn port for mesh

src/freedombone-app-vpn

@@ -46,6 +46,7 @@ VPN_ORGANISATION="Freedombone"
 VPN_UNIT="Freedombone Unit"
 STUNNEL_PORT=3439
 VPN_TLS_PORT=553
+VPN_MESH_TLS_PORT=653
 
 vpn_variables=(MY_EMAIL_ADDRESS
                DEFAULT_DOMAIN_NAME
@@ -504,6 +505,7 @@ function install_stunnel {
     if [ $rootdir ]; then
         prefix=$rootdir
         prefixchroot="chroot $rootdir"
+        VPN_TLS_PORT=$VPN_MESH_TLS_PORT
     fi
 
     $prefixchroot apt-get -yq install stunnel4
@@ -634,6 +636,7 @@ function install_vpn {
     if [ $rootdir ]; then
         prefix=$rootdir
         prefixchroot="chroot $rootdir"
+        VPN_TLS_PORT=$VPN_MESH_TLS_PORT
     fi
     $prefixchroot apt-get -yq install fastd openvpn easy-rsa
 

src/freedombone-mesh-batman

@@ -159,8 +159,8 @@ function stop {
     iptables -D INPUT -p udp --dport 8008 -j ACCEPT
     iptables -D INPUT -p tcp --dport 8008 -j ACCEPT
     # vpn over the internet
-    iptables -D INPUT -p tcp --dport 553 -j ACCEPT
-    iptables -D INPUT -p udp --dport 553 -j ACCEPT
+    iptables -D INPUT -p tcp --dport 653 -j ACCEPT
+    iptables -D INPUT -p udp --dport 653 -j ACCEPT
     iptables -D INPUT -i ${EIFACE} -m state --state NEW -p tcp --dport 1194 -j ACCEPT
     iptables -D INPUT -i tun+ -j ACCEPT
     iptables -D FORWARD -i tun+ -j ACCEPT