diff options
| author | Julien Dessaux | 2011-09-10 00:10:00 +0200 |
|---|---|---|
| committer | Julien Dessaux | 2011-09-10 00:10:00 +0200 |
| commit | 900c242551f624f4ab5b3ea79fd51611b47bd95e (patch) | |
| tree | 215be6ae5c35f08eaa1be497b504abc0b28ee7c6 /Hsbot/Config.hs | |
| parent | Fixed compilation errors. Since I forgot to add the quote module to cabal the... (diff) | |
| parent | Added score sorting for the duck module (diff) | |
| download | hsbot-900c242551f624f4ab5b3ea79fd51611b47bd95e.tar.gz hsbot-900c242551f624f4ab5b3ea79fd51611b47bd95e.tar.bz2 hsbot-900c242551f624f4ab5b3ea79fd51611b47bd95e.zip | |
Merge branch 'master' into quoteModule
Conflicts:
hsbot.cabal
Diffstat (limited to '')
| -rw-r--r-- | Hsbot/Config.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Hsbot/Config.hs b/Hsbot/Config.hs index d51387b..6053e9e 100644 --- a/Hsbot/Config.hs +++ b/Hsbot/Config.hs @@ -16,6 +16,7 @@ defaultConfig = Config , configTLS = noSSL , configAddress = "localhost" , configPort = PortNumber 6667 + , configAccess = [] , configChannels = ["#hsbot"] , configNicknames = ["hsbot"] , configRealname = "The One True bot, with it's haskell soul." @@ -24,12 +25,8 @@ defaultConfig = Config defaultTLSConfig :: TLSConfig defaultTLSConfig = TLSConfig { sslOn = True - , sslCert = "" - , sslKey = "" , sslVersions = [SSL3, TLS10, TLS11, TLS12] - , sslCiphers = [ cipher_null_MD5 - , cipher_null_SHA1 - , cipher_AES128_SHA1 + , sslCiphers = [ cipher_AES128_SHA1 , cipher_AES256_SHA1 , cipher_RC4_128_MD5 , cipher_RC4_128_SHA1 |