commit 5867b7ccc6ffdef556b4139b6e9590ed05dc5b68
Author: Wim <wim@42.be>
Date: Thu Jun 16 21:01:46 2016 +0000
diff --git a/README.md b/README.md
index 9074b8c..241ef7e 100644
--- a/README.md
+++ b/README.md
@@ -566 +5610 @@ SkipTLSVerify=true
nick="matterbot"
channel="#matterbridge"
UseSlackCircumfix=false
+#Freenode nickserv
+NickServNick="nickserv"
+#Password for nickserv
+NickServPassword="secret"
#Ignore the messages from these nicks. They will not be sent to mattermost
IgnoreNicks="ircspammer1 ircspammer2"
@@ -7810 +826 @@ PrefixMessagesWithNick=false
NickFormatter=plain
#how many nicks to list per row for formatters that support this
NicksPerRow=4
-#Freenode nickserv
-NickServNick="nickserv"
-#Password for nickserv
-NickServPassword="secret"
#Ignore the messages from these nicks. They will not be sent to irc
IgnoreNicks="mmbot spammer2"
diff --git a/matterbridge.conf.sample b/matterbridge.conf.sample
index bc989fd..c178503 100644
--- a/matterbridge.conf.sample
+++ b/matterbridge.conf.sample
@@ -66 +68 @@ SkipTLSVerify=true
nick="matterbot"
channel="#matterbridge"
UseSlackCircumfix=false
+#NickServNick="nickserv"
+#NickServPassword="secret"
IgnoreNicks="ircspammer1 ircspammer2"
[mattermost]
@@ -208 +226 @@ IconURL="http://youricon.png"
PrefixMessagesWithNick=false
NickFormatter=plain
NicksPerRow=4
-#NickServNick="nickserv"
-#NickServPassword="secret"
IgnoreNicks="mmbot spammer2"
[general]