summaryrefslogtreecommitdiffstats
path: root/phenny
diff options
context:
space:
mode:
authorSean B. Palmer <http://inamidst.com/sbp/>2010-01-13 13:11:32 +0000
committerSean B. Palmer <http://inamidst.com/sbp/>2010-01-13 13:11:32 +0000
commit22aed08fae3cdccd2e77b5515808f770811b88cc (patch)
tree56783c28d087fecf7e8387965f00d78a18428f54 /phenny
parent5d48dd8ca7a317daf772d0627f0843d315c49876 (diff)
downloadbot-22aed08fae3cdccd2e77b5515808f770811b88cc.tar.gz
bot-22aed08fae3cdccd2e77b5515808f770811b88cc.tar.bz2
bot-22aed08fae3cdccd2e77b5515808f770811b88cc.zip
Added server password stuff from Javier.
Diffstat (limited to 'phenny')
-rwxr-xr-xphenny9
1 files changed, 6 insertions, 3 deletions
diff --git a/phenny b/phenny
index dc36d12..5fb7d7e 100755
--- a/phenny
+++ b/phenny
@@ -30,8 +30,7 @@ def create_default_config(fn):
channels = ['#example', '#test']
owner = 'yournickname'
- # This isn't implemented yet:
- # serverpass = 'yourserverpassword'
+ # password = 'yourserverpassword'
# These are people who will be able to use admin.py's functions...
admins = [owner, 'someoneyoutrust']
@@ -43,7 +42,8 @@ def create_default_config(fn):
#
# enable = []
- # Directories to load opt modules from
+ # Directories to load user modules from
+ # e.g. /path/to/my/modules
extra = []
# Services to load: maps channel names to white or black lists
@@ -135,6 +135,9 @@ def main(argv=None):
if not hasattr(module, 'port'):
module.port = 6667
+ if not hasattr(module, 'password'):
+ module.password = None
+
if module.host == 'irc.example.net':
error = ('Error: you must edit the config file first!\n' +
"You're currently using %s" % module.filename)