From 0859793b1512c141217a4073cf20b4d9dd6a3f78 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Mon, 27 May 2013 16:37:31 -0400
Subject: [PATCH] cleanup

---
 .gitignore        |  3 +--
 config.default.js | 69 -----------------------------------------------
 src/meta.js       | 16 -----------
 3 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 config.default.js

diff --git a/.gitignore b/.gitignore
index 7fdc89c75e..ed5663f82d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ npm-debug.log
 node_modules/
 sftp-config.json
 public/config.json
-config.js
 public/css/style.css
 *.sublime-project
-*.sublime-workspace
\ No newline at end of file
+*.sublime-workspace
diff --git a/config.default.js b/config.default.js
deleted file mode 100644
index 01ba1d9af7..0000000000
--- a/config.default.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * READ ME!
- * The config directives here are all different based on where NodeBB is installed.
- * This config file system will be deprecated soon, and all configs will be moved
- * to the redis db, under the hash "config"
- *
- * As of May 22nd, 2013, this migration hasn't started yet
- */
-
-var config = {
-	// The "secret" is used to encrypt cookie sessions, change this to any random string
-	"secret": 'nodebb-secret',
-
-	// "base_url" is expected to be a publically accessible URL to your NodeBB instance (Default base_url: 'http://localhost', port: '4567')
-	"base_url": "http://localhost",
-	
-	// relative path for uploads
-	"upload_path": "/public/uploads/",
-	
-	"use_port": true,
-	"port": 4567,
-
-	// The host and port to the SMTP server used by NodeBB. The "from" value must be changed.
-	"mailer": {
-		host: 'localhost',
-		port: '25',
-		from: 'mailer@localhost.lan'
-	},
-
-	// Connection details to the redis database instance.
-	"redis": {
-		port: "6379",
-		host: "127.0.0.1",
-		options: {
-			
-		}
-	},
-
-	// Social Networking integration. Add the appropriate API keys to activate
-	// login via alternate method, otherwise the option will not be presented
-	// to the user
-	"twitter": {
-		"key": '',
-		"secret": ''
-	},
-	"google": {
-		"id": '',
-		"secret": ''
-	},
-	"facebook": {
-		"app_id": '',
-		"secret": ''
-	},
-
-	// Privileged Actions Reputation Thresholds
-	"privilege_thresholds": {
-		"manage_thread": 1000,
-		"manage_content": 2000
-	},
-
-	"show_motd": true,
-	"motd": undefined,
-	"post_delay" : 10000
-}
-
-config.url = config.base_url + (config.use_port ? ':' + config.port : '') + '/';
-config.upload_url = config.base_url + (config.use_port ? ':' + config.port : '') + '/uploads/';
-
-module.exports = config;
\ No newline at end of file
diff --git a/src/meta.js b/src/meta.js
index 44d31f2abc..294f3d1fdd 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -3,22 +3,6 @@ var utils = require('./../public/src/utils.js'),
 	async = require('async');
 
 (function(Meta) {
-	Meta.testRedis = function(callback) {
-		RDB.set('nodebb-redis-test', 'foobar', function(err, res) {
-			if (!err) {
-				RDB.get('nodebb-redis-test', function(err, res) {
-					if (!err && res === 'foobar') {
-						callback(true);
-					} else {
-						callback(false);
-					}
-				});
-			} else {
-				callback(false);
-			}
-		});
-	}
-
 	Meta.config = {
 		get: function(callback) {
 			var config = {};