Changeset 9630

Timestamp:

Aug 30, 2011, 6:59:25 PM (13 years ago)

Author:

rick

Message:

Make the import data script more robust.

File:

• src/django_gheat/import_scan_data.sh (modified) (2 diffs)

src/django_gheat/import_scan_data.sh

@@ -6 +6 @@
 MAP_CACHE=${MAP_CACHE:-"/usr/local/var/httpd/cache/maps"}
 MANAGE="`dirname $0`/manage.py"
-SSH_USER=backup
+SSH_USER=${SSH_USER:-$USER}
 SSH_KEY="`dirname $0`/id_rsa"
 export PYTHON_EGG_CACHE=/tmp/
 
+DATAROOT_CHOICES="`pwd $0`/scan-data /usr/local/scan-data"
+if [ "$1" ]; then
+  DATAROOT=$1
+else
+  for D in $DATAROOT_CHOICES; do
+    if [ -d $D ]; then
+      DATAROOT=$D
+    fi
+  done
+fi
+echo "# DATAROOT: $DATAROOT"
+echo "# SSH_USER: $SSH_USER"
+
 echo "# rsync webfolder"
-rsync -e "ssh -i $SSH_KEY -l $SSH_USER -o StrictHostKeyChecking=no" -az tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT
+if [ -r "$SSH_KEY" ]; then
+  SSH_KEY_OPT='-i $SSH_KEY'
+else
+  echo "# warning automatic ssh key $SSH_KEY not readable"
+  SSH_KEY_OPT=''
+fi
+rsync -az -e "ssh $SSH_KEY_OPT -l $SSH_USER -o StrictHostKeyChecking=no" tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT
 
 
@@ -22 +41 @@
 #Kismet netxml Imports
 FILES="`find $DATAROOT -name '*netxml*' | sort`"
-[ -n "$FILES" ] && $MANAGE import_common $ARGS $FILES
+[ -n "$FILES" ] && $MANAGE import_datafile $ARGS $FILES
 
 # Import all measure data