Merge branch 'master' of github.com:trezor/blockbook

This commit is contained in:
Martin Boehm 2018-10-16 12:37:18 +02:00
commit c069d15f56

View file

@ -3,8 +3,6 @@ daemon=1
server=1
{{if .Backend.Mainnet}}mainnet=1{{else}}testnet=1{{end}}
nolisten=1
{{generateRPCAuth .IPC.RPCUser .IPC.RPCPass -}}
rpcport={{.Ports.BackendRPC}}
txindex=1
zmqpubhashtx={{template "IPC.MessageQueueBindingTemplate" .}}
@ -26,4 +24,9 @@ addnode={{$node}}
{{- end}}
{{- end}}
{{- end}}
{{if .Backend.Mainnet}}[main]{{else}}[test]{{end}}
{{generateRPCAuth .IPC.RPCUser .IPC.RPCPass -}}
rpcport={{.Ports.BackendRPC}}
{{end}}