Skip to content

Commit

Permalink
Boyscouts config
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Phoenix committed Feb 7, 2012
1 parent ff03e3e commit b0dcd18
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
15 changes: 7 additions & 8 deletions bin/irccat
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@ end
threads = []
puts "irccat #{IrcCat::VERSION::STRING} (http://irccat.rubyforge.org/)"

@bot = IrcCat::Bot.new(:host => @config['irc']['host'], :port => @config['irc']['port'], :nick => @config['irc']['nick'], :channel => @config['irc']['channel'], :nick_pass => @config['irc']['nick_pass'], :channel_pass => @config['irc']['channel_pass'])

Thread.new {
@bot = IrcCat::Bot.new(:host => @config['irc']['host'], :port => @config['irc']['port'], :nick => @config['irc']['nick'], :channel => @config['irc']['channel'], :nick_pass => @config['irc']['nick_pass'], :channel_pass => @config['irc']['channel_pass'])
}
Thread.new {
@tcp = IrcCat::TcpServer.new(@bot, @config, @config['tcp']['host'], @config['tcp']['port'])
} if @config['tcp']['enabled']
IrcCat::TcpServer.new(@bot, @config, @config['tcp']['host'], @config['tcp']['port'])
}
Thread.new {
@http = IrcCat::HttpServer.new(@bot, @config, @config['http']['host'], @config['http']['port'])
} if @config['http']['enabled']
@bot.run
IrcCat::HttpServer.new(@bot, @config, @config['http']['host'], @config['http']['port'])
}
@bot.run
14 changes: 6 additions & 8 deletions config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# IRC connection
irc:
host: 'irc.tty2.org'
host: 'irc.freenode.net'
port: '6667'
nick: irc_cat
nick_pass: foo
channel: '#irc_cat'
channel_pass: bar
nick: boyscout
channel: '#rubinius'

# HTTP Server

http:
enabled: true
host: 0.0.0.0
port: '3489'
port: '3469'
# Enable post-receive stuff from Github
github: true
# Allow send with http
Expand All @@ -22,6 +20,6 @@ http:

tcp:
enabled: true
host: 0.0.0.0
host: 127.0.0.1
port: '5678'
size: 400
size: 400

0 comments on commit b0dcd18

Please sign in to comment.