Changeset 9672

Timestamp:

Sep 6, 2011, 1:35:36 PM (13 years ago)

Author:

rick

Message:

Proper rsync user/key determinitin

File:

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

src/django_gheat/import_scan_data.sh

@@ -7 +7 @@
 MAP_CACHE=${MAP_CACHE:-"/usr/local/var/httpd/cache/maps"}
 MANAGE="`dirname $0`/manage.py"
-SSH_USER=${SSH_USER:-$USER}
 SSH_KEY="`dirname $0`/id_rsa"
 export PYTHON_EGG_CACHE=/tmp/
@@ -26 +25 @@
 echo "# rsync webfolder"
 if [ -r "$SSH_KEY" ]; then
-  SSH_KEY_OPT='-i $SSH_KEY'
+  SSH_KEY_OPT="-i $SSH_KEY"
+  SSH_USER=backup
 else
   echo "# warning automatic ssh key $SSH_KEY not readable"
   SSH_KEY_OPT=''
+  SSH_USER=${SSH_USER:-$SUDO_USER}
 fi
-rsync -az -e "ssh $SSH_KEY_OPT -l $SSH_USER -o StrictHostKeyChecking=no" tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT
+echo rsync -az -e "ssh $SSH_KEY_OPT -l $SSH_USER -o StrictHostKeyChecking=no" tyan.wirelessleiden.nl:/usr/local/www/webfolder/scan-data/ $DATAROOT