From 70360f376054cfd6b14ceba2d8a7ea65ec526cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 17 Oct 2017 14:12:49 +0200
Subject: [PATCH] Moved files to config folders, and updated pm2 command

---
 .gitignore                                 |  6 +++---
 server/change_pinned.js                    | 20 --------------------
 server/{ => config}/cert_config.example.js |  0
 server/{ => config}/mailconfig.example.js  |  0
 server/config/mongo_config.example.js      |  5 +++++
 server/handlers/db.js                      |  5 +++--
 server/index.js                            |  3 ++-
 server/pm2.json                            |  4 ++--
 server/routing/router.js                   |  4 ++--
 9 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 server/change_pinned.js
 rename server/{ => config}/cert_config.example.js (100%)
 rename server/{ => config}/mailconfig.example.js (100%)
 create mode 100644 server/config/mongo_config.example.js

diff --git a/.gitignore b/.gitignore
index cc2cfba3..11feaa44 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 server/public/assets/images/thumbnails/
-server/mailconfig.js
-server/mongo_config.js
-server/cert_config.js
+server/config/mailconfig.js
+server/config/mongo_config.js
+server/config/cert_config.js
 */node_modules
 node_modules/
 scripts/
diff --git a/server/change_pinned.js b/server/change_pinned.js
deleted file mode 100644
index adb92b9e..00000000
--- a/server/change_pinned.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var readline = require('readline');
-var mongojs = require('mongojs');
-var db = mongojs.connect('mydb');
-
-
-var rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout
-});
-
-rl.question("Channel to pin: ", function(coll) {
-  // TODO: Log the answer in a database
-  db.collection("frontpage_lists").update({pinned:1}, {$set:{pinned:0}}, function(err, resp){
-  	db.collection("frontpage_lists").update({_id:coll}, {$set:{pinned:1}}, function(err, resp){
-  		console.log("Changed pinned channel to: " + coll);
-  		process.exit();
-  	});
-  });
-  rl.close();
-});
\ No newline at end of file
diff --git a/server/cert_config.example.js b/server/config/cert_config.example.js
similarity index 100%
rename from server/cert_config.example.js
rename to server/config/cert_config.example.js
diff --git a/server/mailconfig.example.js b/server/config/mailconfig.example.js
similarity index 100%
rename from server/mailconfig.example.js
rename to server/config/mailconfig.example.js
diff --git a/server/config/mongo_config.example.js b/server/config/mongo_config.example.js
new file mode 100644
index 00000000..3ec5ef43
--- /dev/null
+++ b/server/config/mongo_config.example.js
@@ -0,0 +1,5 @@
+var mongo_config = {
+    config: 'mydb'
+};
+
+module.exports = mongo_config;
diff --git a/server/handlers/db.js b/server/handlers/db.js
index 5b31f49e..9a08dab9 100644
--- a/server/handlers/db.js
+++ b/server/handlers/db.js
@@ -1,6 +1,7 @@
-var mongo_db_cred = {config: 'mydb'};
+var path = require('path');
+var mongo_config = require(path.join(path.join(__dirname, '../config/'), 'mongo_config.js'));
 var mongojs = require('mongojs');
-var db = mongojs(mongo_db_cred.config);
+var db = mongojs(mongo_config.config);
 
 db.collection("chat_logs").createIndex({ "createdAt": 1 }, { expireAfterSeconds: 600 });
 
diff --git a/server/index.js b/server/index.js
index 5f3c2516..5f7a65e1 100755
--- a/server/index.js
+++ b/server/index.js
@@ -8,7 +8,8 @@ pathThumbnails = __dirname;
 var express = require('express');
 var app = express();
 var exphbs = require('express-handlebars');
-var cert_config = require('./cert_config.js');
+console.log(path.join(__dirname, 'config'));
+var cert_config = require(path.join(path.join(__dirname, 'config'), 'cert_config.js'));
 var hbs = exphbs.create({
 	defaultLayout: publicPath + '/layouts/main',
 	layoutsDir: publicPath + '/layouts',
diff --git a/server/pm2.json b/server/pm2.json
index 48cbe36d..35034755 100644
--- a/server/pm2.json
+++ b/server/pm2.json
@@ -1,8 +1,8 @@
 {
   "apps" : [{
     "name"        : "zoff",
-    "script"      : "./server.js",
+    "script"      : "./index.js",
     "watch"       : true,
-    "ignore_watch": ["node_modules", "views/assets/images/thumbnails"],
+    "ignore_watch": ["node_modules", "public/assets/images/thumbnails"],
   }]
 }
diff --git a/server/routing/router.js b/server/routing/router.js
index 04d9c6b3..9e5e7832 100644
--- a/server/routing/router.js
+++ b/server/routing/router.js
@@ -1,8 +1,8 @@
 var express = require('express');
 var router = express.Router();
-const path = require('path');
+var path = require('path');
 var nodemailer = require('nodemailer');
-var mailconfig = require('../mailconfig.js');
+var mailconfig = require(path.join(__dirname, '../config/mailconfig.js'));
 var mongo_db_cred = {config: 'mydb'};
 var mongojs = require('mongojs');
 var db = mongojs(mongo_db_cred.config);