update settings for more heroku support

Conflicts:
	settings.py

1 files changed, 7 insertions, 5 deletions

diff --git a/settings.py b/settings.py
index bdb1e17..beda64f 100644
--- a/settings.py
+++ b/settings.py
@@ -1,5 +1,6 @@
 # warmachine
 #
+import os
 
 # choose the nickname for you bot.
 NICKNAME = 'warmachine'
@@ -10,15 +11,15 @@ NICKSERV_PASSWORD =''
 SERVER = 'irc.freenode.org'
 PORT = 6667
 IDENT = 'warmachine'
+PASSWORD = os.environ['PASSWORD']
 
-CHANNELS = ('#warmachine-dev',)
+CHANNELS = ('#lobby',)
 
-ADMINS = ('com4',)
+ADMINS = ('jason',)
 
-DB_PATH = "warmachine.db"
+DB_PATH = "enderlabs.db"
 
 ACTIONS = (
-    'wmd.actions.passive.nickserv.IdentWithNickserv',
     'wmd.actions.passive.pong.RespondToPing',
     'wmd.actions.passive.topic_archive.TopicArchive',
     'wmd.actions.passive.rejoin_on_kick.RejoinOnKick',
@@ -27,9 +28,10 @@ ACTIONS = (
     'wmd.actions.modules.ListModules',
     'wmd.actions.modules.UnloadModule',
     'wmd.actions.google.GoogleSearch',
+    'wmd.actions.giphy.GiphySearch',
 )
 
 try:
     from local_settings import *
 except ImportError:
-    pass
\ No newline at end of file
+    pass