Merged hotfix-0.6.6 into master

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Tracman Server Changelog
-###### v 0.6.5
+###### v 0.6.6
+
+#### v0.6.6
+
+* Removed demo recording code
+* Moved email server settings to env file
+* Added SMTP check
 
 #### v0.6.5
 

README.md

@@ -1,5 +1,5 @@
 # <img align="left" src="/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman
-###### v 0.6.4
+###### v 0.6.6
 
 node.js application to display a sharable map with user's location.
 
@@ -52,6 +52,12 @@ Tracman will be updated according to [this branching model](http://nvie.com/post
 
 [view full changelog](CHANGELOG.md)
 
+#### v0.6.6
+
+* Removed demo recording code
+* Moved email server settings to env file
+* Added SMTP check
+* 
 #### v0.6.5
 
 * [#96](https://github.com/Tracman-org/Server/issues/96) Fixed google streetview

config/env/sample.js

@@ -20,6 +20,14 @@ module.exports = {
 	url: 'https://localhost:8080',
 	port: 8080,
 	
+	// Mailserver
+	mailserver: 'example.org',
+	mailport: 587,
+	mailauth: {
+		user: 'mailusername',
+		pass: 'XXXXXXXXXX',
+	},
+	
 	// OAuth API keys
 	facebookAppId: 'XXXXXXXXXXXXXXXX',
 	facebookAppSecret: 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',

config/mail.js

@@ -4,26 +4,24 @@ const nodemailer = require('nodemailer'),
 	env = require('./env/env.js');
 
 let transporter = nodemailer.createTransport({
-	host: 'keithirwin.us',
-	port: 587,
+	host: env.mailserver,
+	port: env.mailport,
 	secure: false,
 	requireTLS: true,
-	auth: {
-		user: 'NoReply@tracman.org',
-		pass: 'Ei0UwfrZuE'
-	},
+	auth: env.mailauth,
   // logger: true,
   // debug: true
 });
 
-/* Confirm login */
-// transporter.verify( (err,success)=>{
-// 	if (err){ console.error(`SMTP Error: ${err}`); }
-// 	console.log(`SMTP ${!success?'not ':''}ready...`);
-// } );
-
 module.exports = {
 	
+	verify: ()=>{
+		transporter.verify( (err,success)=>{
+			if (err){ console.error(`SMTP Error: ${err}`); }
+			console.log(`📧 SMTP ${!success?'not ':''}ready`);
+		} );
+	},
+	
 	send: transporter.sendMail.bind(transporter),
 	
 	text: (text)=>{

config/sockets.js

@@ -1,8 +1,7 @@
 'use strict';
 
 // Imports
-const fs = require('fs'),
-	debug = require('debug')('tracman-sockets'),
+const debug = require('debug')('tracman-sockets'),
 	User = require('./models.js').user;
 
 // Check for tracking clients
@@ -98,12 +97,7 @@ module.exports = {
 							};
 							user.save()
 							.catch( (err)=>{ console.error("❌", err.stack); });
-							
-							// If Keith, record location to file
-							if (user.id==='56b020279f740067540f96e9') {
-								fs.appendFile('/srv/tracman/demo.txt', `${loc.tim} ${loc.lat} ${loc.lon} ${loc.dir} ${loc.spd}\n`, function (err) {});
-							}
-								
+
 						}
 					})
 					.catch( (err)=>{ console.error("❌", err.stack); });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tracman",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "Tracks user's GPS location",
   "main": "server.js",
   "dependencies": {

server.js

@@ -14,6 +14,7 @@ const
 	flash = require('connect-flash-plus'),
 	env = require('./config/env/env.js'),
 	User = require('./config/models.js').user,
+	mail = require('./config/mail.js'),
 	app = express(),
 	http = require('http').Server(app),
 	io = require('socket.io')(http),
@@ -166,6 +167,9 @@ const
 /* RUNTIME */ {
 	console.log('🖥  Starting Tracman server...');
 	
+	// Test SMTP server
+	mail.verify();
+	
 	// Listen
 	http.listen( env.port, ()=>{
 		console.log(`🌐 Listening in ${env.mode} mode on port ${env.port}... `);