aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-04-01 11:34:32 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-04-01 11:34:38 +0200
commit8289b1f050b7a89fc2ca97148f629e5ca046d951 (patch)
treed0a74001fb5037bd1510e3b903a405fd61a279cc
parent446bb70fcdff61dfdd770e0624a3885fe2a28bb0 (diff)
parent9d086c01bc33fc264c7d32e69bc42b636439b626 (diff)
downloadbitcoin-8289b1f050b7a89fc2ca97148f629e5ca046d951.tar.xz
Merge pull request #5935
9d086c0 Update bitcoin.conf (CohibAA)
-rw-r--r--contrib/debian/examples/bitcoin.conf18
1 files changed, 18 insertions, 0 deletions
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
index 31cca981e0..ade80d60ea 100644
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@@ -13,6 +13,12 @@
# Connect via a SOCKS5 proxy
#proxy=127.0.0.1:9050
+# Bind to given address and always listen on it. Use [host]:port notation for IPv6
+#bind=<addr>
+
+# Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6
+#whitebind=<addr>
+
##############################################################
## Quick Primer on addnode vs connect ##
## Let's say for instance you use addnode=4.2.2.4 ##
@@ -57,6 +63,10 @@
# server=1 tells Bitcoin-QT and bitcoind to accept JSON-RPC commands
#server=0
+# Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6.
+# This option can be specified multiple times (default: bind to all interfaces)
+#rpcbind=<addr>
+
# You must set rpcuser and rpcpassword to secure the JSON-RPC api
#rpcuser=Ulysseys
#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
@@ -94,6 +104,14 @@
#rpcsslcertificatechainfile=server.cert
#rpcsslprivatekeyfile=server.pem
+# Transaction Fee Changes in 0.10.0
+
+# Send transactions as zero-fee transactions if possible (default: 0)
+#sendfreetransactions=0
+
+# Create transactions that have enough fees (or priority) so they are likely to begin confirmation within n blocks (default: 1).
+# This setting is over-ridden by the -paytxfee option.
+#txconfirmtarget=n
# Miscellaneous options