Changed some stuff related to certs

This commit is contained in:
Matthieu Grieger 2014-11-15 20:43:50 -08:00
parent e51541352b
commit e866714447
3 changed files with 4 additions and 8 deletions

3
mumbledj/.gitignore vendored
View file

@ -1,2 +1 @@
piepan certs
*.ogg

View file

@ -8,13 +8,12 @@ class MumbleDJ
# Initializes a new instance of MumbleDJ. The parameters are as follows: # Initializes a new instance of MumbleDJ. The parameters are as follows:
# username: Desired username of the Mumble bot # username: Desired username of the Mumble bot
# cert: Path to certificate file (if needed)
# server_address: IP address/web address of Mumble server to connect to # server_address: IP address/web address of Mumble server to connect to
# server_port: Port number of Mumble server (generally 64738) # server_port: Port number of Mumble server (generally 64738)
# default_channel: The channel you would like the bot to connect to by # default_channel: The channel you would like the bot to connect to by
# default. If the channel does not exist, the bot will connect to # default. If the channel does not exist, the bot will connect to
# the root channel of the server instead. # the root channel of the server instead.
def initialize(username, server_address, server_port=64738, default_channel="", password="", cert="") def initialize(username, server_address, server_port=64738, default_channel="", password="")
@username = username @username = username
@password = password @password = password
@cert = cert @cert = cert
@ -25,9 +24,7 @@ class MumbleDJ
Mumble.configure do |conf| Mumble.configure do |conf|
conf.sample_rate = 48000 conf.sample_rate = 48000
conf.bitrate = 32000 conf.bitrate = 32000
if @cert != "" conf.ssl_cert_opts[:cert_dir] = File.expand_path("certs")
conf.ssl_cert_opts[:cert_dir] = File.expand_path(@cert)
end
end end
end end

View file

@ -1,7 +1,7 @@
require_relative "mumbledj" require_relative "mumbledj"
require 'thread' require 'thread'
bot = MumbleDJ.new(username="MumbleDJ", server_address="localhost") bot = MumbleDJ.new(username="MumbleDJTest", server_address="matthieugrieger.com")
bot.connect bot.connect
begin begin