[pisa-src] r1093 - trunk/tools

From: René Hummen <rene.hummen@xxxxxxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Mon, 12 Oct 2009 16:22:54 +0200
Author: hummen
Date: Mon Oct 12 16:22:54 2009
New Revision: 1093

Log:
tested autoupdater, fixed config issues and instructions

Modified:
   trunk/tools/autoupdater.sh

Modified: trunk/tools/autoupdater.sh
==============================================================================
--- trunk/tools/autoupdater.sh  Mon Oct 12 15:11:35 2009        (r1092)
+++ trunk/tools/autoupdater.sh  Mon Oct 12 16:22:54 2009        (r1093)
@@ -14,12 +14,17 @@
 REMOTE_DIR=""
 REMOTE_HIPL_DIR=$REMOTE_DIR"hipl--midauth2--2.6/"
 REMOTE_PISA_DIR=$REMOTE_DIR"pisa/trunk/"
+REMOTE_CUSTOM_DIR=$REMOTE_DIR"pisa_custom/"
 LOCAL_DIR=$HOME"/pisa_testbed/"
 
 HIPL_FILES="hipd/hipd tools/hipconf"
 #TODO add required conf-files
 PISA_FILES="pisacd/pisacd pisasd/pisasd pisabeacon/pisabeacon tools/msleep"
-PISA_FILES=$PISA_FILES" tools/switch-ip tools/trigger-hipupdate.sh"
+PISA_FILES=$PISA_FILES" tools/trigger-hipupdate.sh 
tools/trigger-demo-update.sh"
+PISA_FILES=$PISA_FILES" tools/autoupdater.sh"
+# These files might need modifications for your scenario
+#PISA_FILES=$PISA_FILES"tools/switch-ip files/etc/pisa/pisacd.conf"
+CUSTOM_FILES="switch-ip pisacd.conf"
 
 
 #### DON'T CHANGE BELOW ####
@@ -29,7 +34,7 @@
 PK_OPTION=""
 
 echo
-echo "autoupdater for hipl and pisa binaries/configs"
+echo "--- autoupdater for hipl and pisa binaries/configs ---"
 echo
 echo "files will be placed in: "$LOCAL_DIR
 echo
@@ -59,16 +64,26 @@
        REMOTE_FILES=$REMOTE_PATH$REMOTE_PISA_DIR$FILE" "$REMOTE_FILES
 done
 
+for FILE in $CUSTOM_FILES
+do
+       REMOTE_FILES=$REMOTE_PATH$REMOTE_CUSTOM_DIR$FILE" "$REMOTE_FILES
+done
+
 # check for ssh public key
 if [ "$PK" = "" ] || [ ! -e "$HOME/.ssh/$PK" ]; then
     echo "No public key found. Hopefully you have ssh agent-forwarding \
 enabled. Otherwise, you will be asked for your login password for each \
 file to be copied."
+    echo
     echo "As a workaround enable ssh multiplexing in your local \
-.ssh/ssh_config:"
-    echo "Host "$SERVER
-    echo "  ControlMaster auto"
-    echo "  ControlPath ~/.ssh/master-%r@%h:%p"
+~/.ssh/config:"
+    echo "  Host "$SERVER
+    echo "    ControlMaster auto"
+    echo "    ControlPath ~/.ssh/master-%r@%h:%p"
+    echo
+    echo "Then open a separate SSH connection before starting this script:"
+    echo "  ssh "$USER@$SERVER
+    echo
 else
        echo "public key found: "$PK;
        PK_OPTION="-i "$PK
@@ -86,12 +101,13 @@
 echo
 echo "Then run the following commands:"
 echo "- Client"
-echo "1) HIPL:" $LOCAL_DIR"hipd/hipd -kb"
-echo "2) PISA Client:" $LOCAL_DIR"pisacd -f "$LOCAL_DIR"pisacd.conf"
-echo "3) PISA Beacon: ./pisabeacon -lb -s "$LOCAL_DIR"trigger-hipupdate.sh"
-echo "4) Roaming: ./switchip arp-only (first time: without option)"
+echo "1) HIPL:" $LOCAL_DIR"hipd -kb"
+echo "2) PISA Client:" $LOCAL_DIR"pisacd -bf" $LOCAL_DIR"pisacd.conf"
+echo "3) PISA Beacon: "$LOCAL_DIR"pisabeacon -lbs" 
$LOCAL_DIR"trigger-hipupdate.sh"
+echo "4) Roaming: "$LOCAL_DIR"switch-ip arp-only (first time: without option)"
 echo "- Access Point"
-echo "1) PISA Beacon: ./pisabeacon -d 192.168.8.255 -g #GEO-ID# -b"
+echo "1) IPTABLES: iptables -F; iptables -P FORWARD ACCEPT"
+echo "2) PISA Beacon: "$LOCAL_DIR"pisabeacon -bd #BROADCAST-IP# -g #GEO-ID#"
 echo "- Server"
-echo "1) HIPL:" $LOCAL_DIR"hipd/hipd -kb"
-echo "2) PISA Server:" $LOCAL_DIR"pisasd"
+echo "1) HIPL: "$LOCAL_DIR"hipd/hipd -kb"
+echo "2) PISA Server: "$LOCAL_DIR"pisasd"
[pisa-src] r1093 - trunk/tools

Other related posts:
