diff --git a/docker-compose.yml b/docker-compose.yml index b454194..3c4c898 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -173,12 +173,6 @@ services: image: lukechilds/electrs:v0.8.5 # TODO: Change to official image logging: *default-logging depends_on: [ bitcoin ] - command: >- - -vvvv - --timestamp - --db-dir /data/db - --daemon-rpc-addr 10.11.1.1:8332 - --electrum-rpc-addr 0.0.0.0:50001 volumes: - ${PWD}/bitcoin:/data/.bitcoin:ro - ${PWD}/electrs:/data diff --git a/scripts/configure b/scripts/configure index e189970..007be2f 100755 --- a/scripts/configure +++ b/scripts/configure @@ -68,6 +68,7 @@ echo BITCOIN_CONF_FILE="./templates/bitcoin.conf" LND_CONF_FILE="./templates/lnd.conf" TOR_CONF_FILE="./templates/torrc" +ELECTRS_CONF_FILE="./templates/electrs.toml" ENV_FILE="./templates/.env" # Remove intermediary files if they exist from any @@ -75,12 +76,14 @@ ENV_FILE="./templates/.env" [[ -f "$BITCOIN_CONF_FILE" ]] && rm -f "$BITCOIN_CONF_FILE" [[ -f "$LND_CONF_FILE" ]] && rm -f "$LND_CONF_FILE" [[ -f "$TOR_CONF_FILE" ]] && rm -f "$TOR_CONF_FILE" +[[ -f "$ELECTRS_CONF_FILE" ]] && rm -f "$ELECTRS_CONF_FILE" [[ -f "$ENV_FILE" ]] && rm -f "$ENV_FILE" # Copy template configs to intermediary configs [[ -f "./templates/bitcoin-sample.conf" ]] && cp "./templates/bitcoin-sample.conf" "$BITCOIN_CONF_FILE" [[ -f "./templates/lnd-sample.conf" ]] && cp "./templates/lnd-sample.conf" "$LND_CONF_FILE" [[ -f "./templates/torrc-sample" ]] && cp "./templates/torrc-sample" "$TOR_CONF_FILE" +[[ -f "./templates/electrs-sample.toml" ]] && cp "./templates/electrs-sample.toml" "$ELECTRS_CONF_FILE" [[ -f "./templates/.env-sample" ]] && cp "./templates/.env-sample" "$ENV_FILE" @@ -190,6 +193,7 @@ sed -i -e "s/dbcache=/dbcache=$DBCACHE_SIZE/g" "$BITCOIN_CONF_FILE" mv -f "$BITCOIN_CONF_FILE" "./bitcoin/bitcoin.conf" mv -f "$LND_CONF_FILE" "./lnd/lnd.conf" mv -f "$TOR_CONF_FILE" "./tor/torrc" +mv -f "$ELECTRS_CONF_FILE" "./electrs/electrs.toml" mv -f "$ENV_FILE" "./.env" diff --git a/templates/electrs-sample.toml b/templates/electrs-sample.toml new file mode 100644 index 0000000..83e22f4 --- /dev/null +++ b/templates/electrs-sample.toml @@ -0,0 +1,6 @@ +verbose = 4 +network = "bitcoin" # TODO: Inject network +db_dir = "/data/db" +daemon_rpc_addr = "10.11.1.1:8332" # TODO: Inject RPC port +electrum_rpc_addr = "0.0.0.0:50001" +server_banner = "Umbrel " # TODO: Inject version