Merge branch 'master' of baltig.sandia.gov:scot/SCOT

Author: toddbruner

demo/reset.js

@@ -20,8 +20,10 @@ db.user.drop();
 db.apikey.drop();
 db.signature.drop();
 db.sigbody.drop();
+db.getCollection('group').drop()
 
 print ("Creating indexes...");
+db.getCollection('group').ensureIndex({"name": 1},{unique: true, dropDups:true});
 db.alertgroup.ensureIndex(  { "id":          1}, {unique: true, dropDups:true} );
 db.alertgroup.ensureIndex(  { "message_id":  1} );
 db.alertgroup.ensureIndex(  { "updated":     1} );

docker-configs/mongodb/set_mongodb_config.sh

@@ -21,6 +21,7 @@ set='$set'
 # users if we're recreating the container (provided we're using some persistent storage)
 
 if [ ! -f /var/lib/mongodb/mongodb_password_set ]; then
+    mongo scot-prod --host mongodb /opt/scot/install/src/mongodb/reset.js
     mongo scot-prod --host mongodb /opt/scot/install/src/mongodb/admin_user.js
     mongo scot-prod --host mongodb --eval "db.user.update({username:'admin'}, {$set:{pwhash:'$HASH'}}, {multi:true})"
     echo "Mapping set for Mongo" > /var/lib/mongodb/mongodb_password_set

install/src/mongodb/reset.js

@@ -25,9 +25,10 @@ db.apikey.drop();
 db.handler.drop();
 db.stat.drop();
 db.entitytype.drop();
+db.getCollection('group').drop()
 
 print ("Creating indexes...");
-load("./src/mongodb/indexes.js");
+load("./indexes.js");
 print ("Zero-ing the nexid collection...");
-load("./src/mongodb/zero_nextid.js");
+load("./zero_nextid.js");
 

public/admin/index.html

@@ -30,6 +30,7 @@
 						<div class="navbar-inner">
 							<div class="container">
 								<ul class="nav" id="admin_nav">
+									<li><a href=/>Home</li>
 									<li class="active"><a href="#info">Info</a></li>
 									<!--<li><a href="#backup">Backup</a></li>-->
 									<li><a href="#auth">Auth</a></li>