bug fixes

modules/first_boot/templates/first_boot.sh.erb

@@ -31,7 +31,7 @@ RAILS_PWD="$(openssl rand -hex 8)"
 JOULE_PWD="$(openssl rand -hex 8)"
 service joule stop
 rm -f /etc/joule/main.conf
-joule admin initialize --dsn joule:$JOULE_PWD@localhost:5432/joule <% if @nilmdb %> --nilmdb http://localhost/nilmdb <% end %>
+joule admin initialize --dsn joule:$JOULE_PWD@localhost:5432/joule <% if @nilmdb %> --nilmdb http://127.0.0.1:8081/nilmdb <% end %>
 
 
 echo "# Generating Rails secrets"

modules/joule/manifests/config.pp

@@ -31,7 +31,7 @@ class joule::config {
   }
   $dsn = 'joule:joule@localhost:5432/joule'
   if $facts['image_type']=='nilm' {
-    $cmd = "joule admin initialize --dsn=${dsn} --nilmdb=http://127.0.0.1/nilmdb"
+    $cmd = "joule admin initialize --dsn=${dsn} --nilmdb=http://127.0.0.1:8081/nilmdb"
   } else {
     $cmd = "joule admin initialize --dsn=${dsn}"
   }

modules/nginx/files/nilmdb.conf

 location /nilmdb {
   proxy_buffering off;
-  proxy_pass http://localhost:8081;
+  proxy_pass http://127.0.0.1:8081;
 }	     
\ No newline at end of file

rpi_cleanup.sh

@@ -10,6 +10,9 @@ sudo -u postgres psql <<END_OF_SQL
 DROP DATABASE joule;
 DROP DATABASE rails;
 END_OF_SQL
+# remove nilmdb database
+rm -rf /opt/data/*
+
 echo "2] Erasing module and stream configurations"
 rm -f /etc/joule/module_configs/*.conf
 rm -f /etc/joule/stream_configs/*.conf