Skip to content

Commit 5e5afe1

Browse files
committed
Make conf.js actually json.
1 parent f3707f8 commit 5e5afe1

File tree

6 files changed

+41
-46
lines changed

6 files changed

+41
-46
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
conf.js
2+
conf.json
23
*.swp
34
node_modules/*

bin/treslek.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var logstashSink = require('logmagic-logstash').LogstashSink;
55

66

77
var treslek = require('../lib/treslek');
8-
var conf = require('../conf').conf;
8+
var conf = require('../conf.json');
99

1010
var logstash = new logstashSink('bubba', '162.209.99.44', 9999);
1111

conf.js.dist

Lines changed: 0 additions & 40 deletions
This file was deleted.

conf.json.dist

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"nick": "treslekbot",
3+
"host": "localhost",
4+
"ircOptions": {
5+
"port": 6667,
6+
"channels": ["##treslek"],
7+
"userName": "treslekbot",
8+
"realName": "treslekbot",
9+
"autoConnect": false,
10+
"floodProtection": true,
11+
"floodProtectionDelay": 100
12+
},
13+
"ignored": ["doslek"],
14+
"commandPrefix": "!",
15+
"redis": {
16+
"host": "127.0.0.1",
17+
"port": "6379",
18+
"prefix": "treslek"
19+
},
20+
"topics": {
21+
"separator": "::",
22+
"prefixes": {
23+
"##treslek": "Treslek"
24+
}
25+
},
26+
"webhook": {
27+
"host": "0.0.0.0",
28+
"port": "1304",
29+
"channelKey": "webhookChannels"
30+
},
31+
"logstash": {
32+
"host": "localhost",
33+
"port": 9999
34+
},
35+
"admins": ["jirwin", "morgabra"],
36+
"plugins": [],
37+
"plugins_dir": "/vagrant/plugins"
38+
}

lib/sandbox.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,12 @@ var Sandbox = function(conf, irc, redis, commands, usage) {
105105
},
106106

107107
redisConf: _.clone(conf.redis),
108-
pluginsConf: _.clone(conf.plugins_conf),
109108

110109
commands: commands,
111110

112111
config: {
113112
nick: conf.nick,
114113
topics: conf.topics,
115-
github: conf.github,
116-
comics: conf.comics,
117-
rackspace: conf.rackspace,
118114
commandPrefix: conf.commandPrefix
119115
},
120116

scripts/install_plugins.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var path = require('path');
44
var npm = require('npm');
55
var async = require('async');
66

7-
var config = require('../conf.js').conf;
7+
var config = require('../conf.json');
88

99
function main() {
1010
npm.load(null, function(err) {

0 commit comments

Comments
 (0)