Merge branch 'master' into tr_graph

Author: mwfarb

.gitignore

@@ -17,13 +17,13 @@
 *~
 
 # User-defined webapp node addresses
-clients_default.json
-clients_user.json
-servers_user.json
+webapp/web/config/clients_default.json
+webapp/web/config/clients_user.json
+webapp/web/config/servers_user.json
 
 # Generated webapp data and logging
-webapp.db
-webapp/data
+webapp/web/webapp.db
+webapp/web/data
 .webapp
 
 # IDE project files

Makefile

@@ -1,7 +1,7 @@
 .PHONY: all clean
 
 ROOT_DIR=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-SRCDIRS= helloworld sensorapp/sensorserver sensorapp/sensorfetcher camerapp/imageserver camerapp/imagefetcher bwtester/bwtestserver bwtester/bwtestclient webapp bat bat/example_server tools/pathdb_dump roughtime/timeserver roughtime/timeclient ssh/client ssh/server netcat
+SRCDIRS= helloworld sensorapp/sensorserver sensorapp/sensorfetcher camerapp/imageserver camerapp/imagefetcher bwtester/bwtestserver bwtester/bwtestclient webapp bat bat/example_server tools/pathdb_dump ssh/client ssh/server netcat
 TARGETS = $(foreach D,$(SRCDIRS),$(D)/$(notdir $(D)))
 
 all: $(TARGETS)

camerapp/imageserver/paparazzi.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from picamera import PiCamera, Color
 from time import sleep

deps.sh

@@ -11,5 +11,6 @@ if ! verleq 1.11.0 "$V"; then
     echo "Go version 1.11 or newer required"
     exit 1
 fi
+sudo apt-get install -y libpam0g-dev
 command -v govendor >/dev/null || go get github.com/kardianos/govendor
 govendor sync -v