Moved environment files to own folder

.gitignore

@@ -2,8 +2,8 @@
 node_modules
 
 # Secret stuff
-config/env*
-!config/env-sample.js
+config/env/*
+!config/env/sample.js
 
 # Minified static files (can be built with `npm run minify`)
 static/**/*.min.*

README.md

@@ -9,7 +9,16 @@ node.js application to display a sharable map with user's location.
 $ git clone https://github.com/Tracman-org/Server.git && (cd Server && exec npm install)
 ```
 
-You will need to set up a configuration file at `config/env.js`.  Use `config/env-sample.js` for an example.  You can get API keys at the [google developer's console](https://console.developers.google.com/apis/credentials).  You will need to set up approved hosts and auth callbacks.  There is more information in [their documentation](https://support.google.com/googleapi/answer/6158857?hl=en).
+You will need to set up a configuration file at `config/env/env.js`.  Use `config/env/sample.js` for an example.  You can get API keys at the [google developer's console](https://console.developers.google.com/apis/credentials).  You will need to set up approved hosts and auth callbacks.  There is more information in [their documentation](https://support.google.com/googleapi/answer/6158857?hl=en).  
+
+A good method is to simply copy the sample configuration and point `config/env/env.js` to the new version: 
+
+```sh
+$ cp config/env/sample.js config/env/my-config.js
+$ echo "module.exports = require('./my-config.js');" > config/env/env.js
+```
+
+Then edit `config/env/my-config.js` to match your local environment.  
 
 ## Running
 

config/mail.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const nodemailer = require('nodemailer'),
-	env = require('./env.js');
+	env = require('./env/env.js');
 
 let transporter = nodemailer.createTransport({
 	host: 'keithirwin.us',

config/middleware.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const env = require('./env.js');
+const env = require('./env/env.js');
 
 module.exports = {
 

config/passport.js

@@ -8,7 +8,7 @@ const
 	GoogleTokenStrategy = require('passport-google-id-token'),
 	FacebookTokenStrategy = require('passport-facebook-token'),
 	TwitterTokenStrategy = require('passport-twitter-token'),
-	env = require('./env.js'),
+	env = require('./env/env.js'),
 	mw = require('./middleware.js'),
 	User = require('./models.js').user;
 	

config/routes/auth.js

@@ -5,7 +5,7 @@ const
 	mail = require('../mail.js'),
 	User = require('../models.js').user,
 	crypto = require('crypto'),
-	env = require('../env.js');
+	env = require('../env/env.js');
 
 module.exports = (app, passport) => {
 

config/routes/map.js

@@ -3,7 +3,7 @@
 
 const router = require('express').Router(),
   mw = require('../middleware.js'),
-  env = require('../env.js'),
+  env = require('../env/env.js'),
   User = require('../models.js').user;
 
 // Redirect to real slug

config/routes/settings.js

@@ -6,7 +6,7 @@ const slug = require('slug'),
 	mw = require('../middleware.js'),
 	User = require('../models.js').user,
 	mail = require('../mail.js'),
-	env = require('../env.js'),
+	env = require('../env/env.js'),
 	router = require('express').Router();
 
 // Validate email addresses

server.js

@@ -11,7 +11,7 @@ const
 	nunjucks = require('nunjucks'),
 	passport = require('passport'),
 	flash = require('connect-flash-plus'),
-	env = require('./config/env.js'),
+	env = require('./config/env/env.js'),
 	User = require('./config/models.js').user,
 	app = express(),
 	http = require('http').Server(app),