Incorporate changes from other machines

This commit is contained in:
Donald Burr 2015-02-14 21:57:16 -08:00
parent c3b94b7106
commit b1d3e2c146
7 changed files with 191 additions and 15 deletions

View file

@ -494,6 +494,7 @@ cd /home/motion && nohup bash run_server &\
fi
# set up streaming monitor
# based on: https://github.com/Tomtomgo/raspberry_livestream
#echo "Note: this install includes a build of ffmpeg and nginx which takes a"
#echo "LONG time (about 3-4 hours.)"
echo -n "Install streaming video server? [yn] "