Merge branch 'fulltree' of github.com:spesmilo/electrum-server into fulltree

[electrum-server.git] / electrum.conf.sample

diff --git a/electrum.conf.sample b/electrum.conf.sample
index 65c58fc..0960d5b 100644 (file)
--- 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
@@ -20,31 +20,12 @@ irc = yes
 backend = leveldb
 
 [leveldb]
-path = /path/to/your/database
+#path = /path/to/your/database
+#fulltree is the new UTXO tree, required for Electrum 2.0 clients
+path_fulltree = /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
-
-# 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