learnlinux
diff --git a/‎client/imports/ui/pages/lab/labview.ts‎
Lines changed: 2 additions & 2 deletions b/‎client/imports/ui/pages/lab/labview.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎collections/README.md‎
Lines changed: 14 additions & 2 deletions b/‎collections/README.md‎
Lines changed: 14 additions & 2 deletions
diff --git a/‎collections/course_records.ts‎
Lines changed: 6 additions & 0 deletions b/‎collections/course_records.ts‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎collections/users.ts‎
Lines changed: 17 additions & 2 deletions b/‎collections/users.ts‎
Lines changed: 17 additions & 2 deletions
diff --git a/‎private/settings.env.json‎
Lines changed: 2 additions & 1 deletion b/‎private/settings.env.json‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎server/imports/api/env.os_families.js‎
Lines changed: 44 additions & 0 deletions b/‎server/imports/api/env.os_families.js‎
Lines changed: 44 additions & 0 deletions
@@ -79,8 +79,8 @@ export default class LabView extends MeteorComponent {
       slf.labProgress = "0 / "+slf.tasks.length;
       slf.auth = {
         username: Meteor.user().profile.nickname,
-        password: res.sshInfo.pass,
-        domain: "10.100.1.11"
+        password: res.system.password,
+        domain: res.system.node_ip
       };
       slf.taskUpdates = res.taskUpdates;
 
 
@@ -36,6 +36,16 @@ The following document describes the MongoDB Schema used by the TuxLab app:
       message: 'Git Lab is due in 2 Weeks',
       link: 'course/1/lab/12'
     }
+  ],
+  sessions: [
+    {
+      labId: "574467bc11091623418a429d",
+      started: 1469648536858
+    },
+    {
+      labId: "1346m2hjdj9f3kn003nbh93f",
+      started: 1469348565858
+    } 
   ]
 },
 {
@@ -145,9 +155,11 @@ The following document describes the MongoDB Schema used by the TuxLab app:
           grade: {16,100} // TUPLE
           data: {
             // INSTRUCTORS INJECT DATA
-          }
+          },
+          attempted: [1467903228163, 1467905328235, 1467906228438] 
         }
-      ]
+      ],
+      attempted: [1467905208238, 1467905728238]
     }
   ]
 }
 
@@ -55,6 +55,9 @@ if(Meteor.isServer) {
       data: {
         type: Object,
         optional: true
+      },
+      attempted: {
+        type: [Number]
       }
     });
     var labSchema = new SimpleSchema({
@@ -71,6 +74,9 @@ if(Meteor.isServer) {
         type: Object,
         optional: true
       },
+      attempted: {
+        type: [Number]
+      },
       tasks: {
         type: [taskSchema]
       }
 
@@ -75,6 +75,18 @@ if (Meteor.isServer){
         optional: true
       }
     })
+    
+    var sessionSchema = new SimpleSchema({
+      labId:{
+        type: String
+      },
+      started:{
+        type: Number,
+	autoValue: function(){
+	  return Date.now();
+	}
+      }
+    });
 
     // Overall User Schema
     var userSchema = new SimpleSchema({
@@ -92,6 +104,9 @@ if (Meteor.isServer){
       announcements:{
         type: [announcementSchema],
         defaultValue: []
+      },
+      sessions:{
+        type: sessionSchema
       }
     });
     (<any> Meteor.users).attachSchema(userSchema);
@@ -175,11 +190,11 @@ if(Meteor.isServer) {
   Meteor.startup(function() {
     Meteor.publish('userRoles', function() {
       this.autorun(function(computation) {
-        return Meteor.users.find(this.userId, { fields: { "roles": 1} });
+        return Meteor.users.find(this.userId, { fields: { "roles": 1, "sessions": 1} });
       });
     });
   });
 }
 if(Meteor.isClient) {
     Meteor.subscribe('userRoles');
-}
+}
@@ -4,10 +4,11 @@
   "key_ca" : "",
   "swarm_node_ip" : "10.100.1.10",
   "swarm_node_port" : "4000",
+  "swarm_cert_dir" : "/etc/ssl/local",
   "etcd_node_ip" : "10.100.1.10",
   "etcd_node_port" : "2379",
     "etcd_user" : "meteor",
-  "etcd_pass" : "fff86d549374f03f4ba82bfe170b5018",
+  "etcd_pass" : "6190f52cef3adb60598d6fdc8213bf9c",
     "default_image" : "alpine",
   "mongo_log_url" : "ds025792.mlab.com:25792/tuxlab",
   "mongo_log_collection" : "logs"
 
@@ -0,0 +1,44 @@
+//secure keys are not defined, but may be implemented
+
+/** supported linux families for lab virtual machines
+ * although instructors can pass system objects like the ones below,
+ * no other os has been tested and may not function as expected
+ * if the os_family field is not provided, all systems default to alpine
+ */
+var os_families = {
+  //alpine defaults to the tuxlab_labvm image
+  alpine: {
+    username: "root",
+    password: "",
+    key: "",
+    os_family: "alpine",
+    image: "tuxlab_labvm",
+    ssh_port: 22
+  },
+
+  redhat: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "redhat",
+    image: ""
+  },
+
+  debian: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "debian",
+    image: ""
+  },
+
+  arch: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "arch",
+    image: ""
+  }
+}
+
+module.exports = os_families;
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,16 @@ The following document describes the MongoDB Schema used by the TuxLab app:`
`36`	`36`	`message: 'Git Lab is due in 2 Weeks',`
`37`	`37`	`link: 'course/1/lab/12'`
`38`	`38`	`}`
	`39`	`+ ],`
	`40`	`+ sessions: [`
	`41`	`+ {`
	`42`	`+ labId: "574467bc11091623418a429d",`
	`43`	`+ started: 1469648536858`
	`44`	`+ },`
	`45`	`+ {`
	`46`	`+ labId: "1346m2hjdj9f3kn003nbh93f",`
	`47`	`+ started: 1469348565858`
	`48`	`+ }`
`39`	`49`	`]`
`40`	`50`	`},`
`41`	`51`	`{`
`@@ -145,9 +155,11 @@ The following document describes the MongoDB Schema used by the TuxLab app:`
`145`	`155`	`grade: {16,100} // TUPLE`
`146`	`156`	`data: {`
`147`	`157`	`// INSTRUCTORS INJECT DATA`
`148`		`- }`
	`158`	`+ },`
	`159`	`+ attempted: [1467903228163, 1467905328235, 1467906228438]`
`149`	`160`	`}`
`150`		`- ]`
	`161`	`+ ],`
	`162`	`+ attempted: [1467905208238, 1467905728238]`
`151`	`163`	`}`
`152`	`164`	`]`
`153`	`165`	`}`