diff --git a/pi/generate-keys.sh b/pi/generate-keys.sh old mode 100644 new mode 100755 index 81d0f2f..892f196 --- a/pi/generate-keys.sh +++ b/pi/generate-keys.sh @@ -1,4 +1,4 @@ -#! /usr/bin/env +#! /usr/bin/env bash -openssl rsa -out private.pem 1024 +openssl genrsa -out private.pem 1024 openssl rsa -in private.pem -pubout -out public.pem -outform PEM diff --git a/pi/generate-keys.sh b/pi/generate-keys.sh old mode 100644 new mode 100755 index 81d0f2f..892f196 --- a/pi/generate-keys.sh +++ b/pi/generate-keys.sh @@ -1,4 +1,4 @@ -#! /usr/bin/env +#! /usr/bin/env bash -openssl rsa -out private.pem 1024 +openssl genrsa -out private.pem 1024 openssl rsa -in private.pem -pubout -out public.pem -outform PEM diff --git a/pi/monitor.py b/pi/monitor.py index d234973..aacf566 100644 --- a/pi/monitor.py +++ b/pi/monitor.py @@ -9,6 +9,8 @@ import urllib2 +import traceback + if len(sys.argv) < 2: print "No id" exit(1) @@ -40,7 +42,7 @@ print "status now: " + str(status) try: - response = urllib2.urlopen("https://www.mhack.io/status-update.php?door_id=" + str(id) + "&status=" + ("1" if status else "0")) + response = urllib2.urlopen("https://www.mhack.io/bathroom/status-update.php?door_id=" + str(id) + "&status=" + ("1" if status else "0")) enc_verify = base64.b64decode(response.read()) @@ -48,9 +50,10 @@ print " verifying with: " + verify - response = urllib2.urlopen("https://www.mhack.io/verify-status.php?door_id=" + str(id) + "&verify=" + verify) + response = urllib2.urlopen("https://www.mhack.io/bathroom/verify-status.php?door_id=" + str(id) + "&verify=" + verify) print " returned: " + response.read() - except e: + except Exception as e: print str(e) + traceback.print_tb(sys.exc_info()[2]) sleep(1)