From: Eagle[TM] <eagletm@mpex.net>
Date: Fri, 3 Jan 2014 12:18:28 +0000 (+0100)
Subject: set IRC default to off, cleanup sample config
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=4d29c30f4782abb7b5eb663e17d82b3f51831d21;hp=b8309d9afb413da20f012a2b8e531d4e8c114f50

set IRC default to off, cleanup sample config
---

diff --git a/README-IRC.md b/README-IRC.md
index 75a8a9b..39c9af1 100644
--- a/README-IRC.md
+++ b/README-IRC.md
@@ -13,7 +13,7 @@ The following config file options are used by the IRC part of Electrum server:
     #report_stratum_http_port = 80
 
 `irc` is used to determine whether the IRC thread will be started or the 
-Electrum server will run in private mode. In private mode, 
+Electrum server will run in private mode (default). In private mode, 
 `./server.py peers` will always return an empty list.
 
 `host` is a fully-qualified domain name (FQDN) of your Electrum server. It is
diff --git a/electrum.conf.sample b/electrum.conf.sample
index 4a1d5d8..d0a6468 100644
--- a/electrum.conf.sample
+++ b/electrum.conf.sample
@@ -11,7 +11,7 @@ stratum_http_port = 8081
 #report_stratum_http_ssl_port = 443
 password = secret
 banner = Welcome to Electrum!
-irc = yes
+#irc = no
 #irc_nick = <yournickname>
 #ssl_certfile = /path/to/electrum-server.crt
 #ssl_keyfile = /path/to/electrum-server.key
@@ -24,28 +24,6 @@ path = /path/to/your/database
 # for each address, history will be pruned if it is longer than this limit
 pruning_limit = 100
 
-
-# ABE configuration for full servers
-# Backends other than level db are deprecated and currently unsupported
-
-# number of requests per single hash
-# limit = 1000
-
-# [database]
-# type = MySQLdb
-# database = electrum
-# username = electrum
-# password = secret
-
-# [database]
-# type = psycopg2
-# database = electrum
-#
-# [database]
-# type = sqlite3
-# database = electrum.sqlite
-
-
 [bitcoind]
 host = localhost
 port = 8332
diff --git a/server.py b/server.py
index d41bcf3..eb2b548 100755
--- a/server.py
+++ b/server.py
@@ -57,7 +57,7 @@ def create_config():
     config.set('server', 'ssl_certfile', '')
     config.set('server', 'ssl_keyfile', '')
     config.set('server', 'password', '')
-    config.set('server', 'irc', 'yes')
+    config.set('server', 'irc', 'no')
     config.set('server', 'irc_nick', '')
     config.set('server', 'coin', '')
     config.set('server', 'datadir', '')