summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Franke <nobody@nowhere.ws>2011-05-18 16:31:08 +0200
committerChristian Franke <nobody@nowhere.ws>2011-05-18 16:31:08 +0200
commit85eceb160776ca8bded119ae989a5a9713e5aa75 (patch)
tree17db5f33fd6352a0f4b87fcbc7a5185f2a7ec50d
parenta13f87b1dcc3929917e4fdcfb93f251b8cd78766 (diff)
download dachcam image directly from webcam
-rwxr-xr-xscripts/dachcam3
-rw-r--r--scripts/webcamscript2
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/dachcam b/scripts/dachcam
index 78b4f93..6dd294d 100755
--- a/scripts/dachcam
+++ b/scripts/dachcam
@@ -1,6 +1,7 @@
#!/bin/bash
-URL="http://172.22.83.12/webcam/webcam.png" # This actually is a jpeg...
+URL="http://104.61.104.9:8000/images1sif" # This actually is a jpeg...
+WGET_ARGS="--user=root --password=weltrekord"
NAME="dach"
TIMESTAMP="no"
diff --git a/scripts/webcamscript b/scripts/webcamscript
index 3b490fb..883ef79 100644
--- a/scripts/webcamscript
+++ b/scripts/webcamscript
@@ -5,7 +5,7 @@
TODAY=`date`
TIME=`date +"%H"`
-wget "${URL}" -O ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg &> /dev/null || exit 1
+wget "${URL}" $WGET_ARGS -O ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg &> /dev/null || exit 1
cp ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg
mogrify -resize 200x150 ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg