Allow configuration of port numbers

Author: JimNasbyGE

.default.sh

@@ -0,0 +1,2 @@
+CHISEL_LOCAL_PORT=${CHISEL_LOCAL_PORT:-5022}
+CHISEL_REMOTE_PORT=${CHISEL_REMOTE_PORT:-2022}

push.sh

@@ -3,14 +3,15 @@
 set -e # exit on error
 
 cd `dirname $0`
+source .default.sh
 
 appname="cf-ssh-chisel-$USER"
 
 # Generate a key to identify the server (if one doesn't already exist)
 # TODO: put all generated files (this and id_rsa.pub) into a single directory
 if [ ! -r ssh_host_rsa_key ]; then
   ssh-keygen -t rsa -f ssh_host_rsa_key -N '' -C "chisel-ssh identity for $appname"
-  echo '[localhost]:5022' `cat ssh_host_rsa_key.pub` >> ~/.ssh/known_hosts
+  echo '[localhost]:$CHISEL_LOCAL_PORT' `cat ssh_host_rsa_key.pub` >> ~/.ssh/known_hosts
 fi
 
 if [ ! -r id_rsa.pub ]; then
@@ -27,7 +28,7 @@ have one.
 Host chisel
     ForwardAgent yes
     HostName localhost
-    Port 5022
+    Port $CHISEL_LOCAL_PORT
     User vcap
     Compression yes
 _EOF_

tunnel

@@ -5,6 +5,7 @@ set -e # exit on error
 cd `dirname $0`
 
 appname="cf-ssh-chisel-$USER"
+echo "Starting $appname forwarding local port ${CHISEL_LOCAL_PORT:=5022} to remote port ${CHISEL_REMOTE_PORT:=2022}"
 
 echo "Checking if $appname is running"
 cf app $appname > /dev/null # Make sure app is there
@@ -22,18 +23,20 @@ url=`cf app $appname | egrep 'routes|urls' | awk '{print $2}'`
 echo "$url" | grep "$appname" | grep -q predix.io || { echo "URL doesn't look sane: $url"; exit 2; }
 
 # If there's an existing client running, kill it
-client_pids=`ps auxww | grep ./chisel | grep 5022:2022 | grep -v grep | awk '{print $2}'`
+client_pids=`ps auxww | grep ./chisel | grep ${CHISEL_LOCAL_PORT}:${CHISEL_REMOTE_PORT} | grep -v grep | awk '{print $2}'`
 if [ -n "$client_pids" ]; then
   kill $client_pids
 fi
 
 echo "Starting client, connecting to $url"
-./chisel client --keepalive 10s https://$url 5022:2022 > /dev/null &
+cmd="./chisel client --keepalive 10s https://$url ${CHISEL_LOCAL_PORT}:${CHISEL_REMOTE_PORT}"
+echo "Running in background: $cmd"
+$cmd > /dev/null &
 
 cat <<_EOF_
 You can now connect via
 
-ssh vcap@localhost -p 5022
+ssh vcap@localhost -p ${CHISEL_LOCAL_PORT}
 
 or **IF** you added an entry to ~/.ssh/config: