From d9f64fd4d34761cb776989a47e80a768da2b9e07 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Sun, 20 Nov 2016 22:21:00 +0200
Subject: [PATCH] cleanup debug

---
 bin/cert-gen.sh | 12 ++++++++++--
 lib/routes.js   |  4 ----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/cert-gen.sh b/bin/cert-gen.sh
index c76e4361..030854c3 100755
--- a/bin/cert-gen.sh
+++ b/bin/cert-gen.sh
@@ -20,7 +20,7 @@ mkdir -p $SEEDS_DIR >> $LOG_FILE 2>&1
 SEED=$(openssl rand -hex 32)
 echo $SEED > $SEED_FILE
 
-echo "Generating SSL certificates (takes a few seconds)..."
+echo "Generating SSL certificates..."
 
 CA_KEY_PATH=$KEY_DIR/Lamassu_OP_Root_CA.key
 CA_PATH=$CERT_DIR/Lamassu_OP_Root_CA.pem
@@ -33,6 +33,7 @@ openssl genrsa \
 
 openssl req \
   -x509 \
+  -sha256 \
   -new \
   -nodes \
   -key $CA_KEY_PATH \
@@ -48,7 +49,11 @@ openssl genrsa \
 openssl req -new \
   -key $SERVER_KEY_PATH \
   -out /tmp/Lamassu_OP.csr.pem \
-  -subj "/C=IS/ST=/L=Reykjavik/O=Lamassu Operator/CN=$DOMAIN" \
+  -subj "/C=IS/ST=/L=Reykjavik/O=Lamassu Operator/CN=$IP" \
+  -reqexts SAN \
+  -sha256 \
+  -config <(cat /etc/ssl/openssl.cnf \
+      <(printf "[SAN]\nsubjectAltName=IP.1:$IP")) \
   >> $LOG_FILE 2>&1
 
 openssl x509 \
@@ -57,6 +62,9 @@ openssl x509 \
   -CAkey $CA_KEY_PATH \
   -CAcreateserial \
   -out $SERVER_CERT_PATH \
+  -extfile <(cat /etc/ssl/openssl.cnf \
+      <(printf "[SAN]\nsubjectAltName=IP.1:$IP")) \
+  -extensions SAN \
   -days 3650 >> $LOG_FILE 2>&1
 
 rm /tmp/Lamassu_OP.csr.pem
diff --git a/lib/routes.js b/lib/routes.js
index 389933dd..87deeb51 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -67,8 +67,6 @@ function poll (req, res) {
 
   pids[deviceId] = {pid, ts: Date.now()}
 
-  logger.debug('poll request from: %s', deviceId)
-
   let rates = {}
   let balances = {}
 
@@ -329,7 +327,6 @@ function filterOldRequests (req, res, next) {
 
 function authorize (req, res, next) {
   const deviceId = req.connection.getPeerCertificate().fingerprint
-  console.log(deviceId)
 
   return pairing.isPaired(deviceId)
   .then(r => {
@@ -392,7 +389,6 @@ function init (opts) {
   localApp.post('/reboot', (req, res) => {
     const pid = req.body.pid
     const deviceId = req.body.deviceId
-    console.log('pid: %s, deviceId: %s', pid, deviceId)
 
     if (!deviceId || !pid) {
       return res.sendStatus(400)