From 28327d8604927f59183ccfa269af2f083f572da4 Mon Sep 17 00:00:00 2001 From: status404 Date: Fri, 29 Nov 2024 13:40:12 +0300 Subject: [PATCH] add apivariant --- README.md | 7 ++++--- docker/Dockerfile | 2 +- docker/run.sh | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1c4e706..55b99b0 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,12 @@ Container images are configured using parameters passed at runtime. |Parameter|Function| |:--------|:-------| -|-p 8442|XML-RPC API port TCP| -|-e BITMESSAGE_API_USER=|XML-RPC API user. Default: `bitmessage_api_user`| -|-e BITMESSAGE_API_PASSWORD=|XML-RPC API password. Default: `bitmessage_api_password`| +|-p 8442|API port| +|-e BITMESSAGE_API_USER|XML-RPC API user. Default: `bitmessage_api_user`| +|-e BITMESSAGE_API_PASSWORD|XML-RPC API password. Default: `bitmessage_api_password`| |-e BITMESSAGE_SEED_PHRASE|Create Deterministic Addresses password. Default: created randomly. | |-e BITMESSAGE_SEED_ADDRESSES|Number of Deterministic Addresses to generate. Default: `1`| |-e BITMESSAGE_TTL|The expiration of newly send messages, in seconds. Default: `172800`| |-e BITMESSAGE_STOPRESENDINGAFTERXDAYS|Stop resending unreceived message after X days. Default: `60`| +|-e BITMESSAGE_APIVARIANT|provides xml or json-RPC API. Default: `legacy`| diff --git a/docker/Dockerfile b/docker/Dockerfile index 26bb9da..7f56560 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,7 +22,7 @@ RUN pip2 install jsonrpclib . FROM ubuntu:bionic -EXPOSE 8442 +EXPOSE 8442/tcp ENV USER_UID=2000 ENV USER_GID=2000 diff --git a/docker/run.sh b/docker/run.sh index 2d2efe9..741e06e 100644 --- a/docker/run.sh +++ b/docker/run.sh @@ -6,6 +6,7 @@ export BITMESSAGE_SEED_ADDRESSES=${BITMESSAGE_SEED_ADDRESSES:-1} export BITMESSAGE_API_PORT=${BITMESSAGE_API_PORT:-8442} export BITMESSAGE_TTL=${BITMESSAGE_TTL:-172800} export BITMESSAGE_STOPRESENDINGAFTERXDAYS=${BITMESSAGE_STOPRESENDINGAFTERXDAYS:-30} +export BITMESSAGE_APIVARIANT=${BITMESSAGE_APIVARIANT:-legacy} SEED_FILE="address_seed.txt" test -e "$SEED_FILE" || gosu bitmessage touch "$SEED_FILE" @@ -28,7 +29,7 @@ chmod 600 keys.dat # set config values gosu bitmessage sed -i -e "s|\(apiinterface = \).*|\10\.0\.0\.0|g" \ - -e "s|\(apivariant = \).*|\1legacy|g" \ + -e "s|\(apivariant = \).*|\1$BITMESSAGE_APIVARIANT|g" \ -e "s|\(apiusername = \).*|\1$BITMESSAGE_API_USER|g" \ -e "s|\(apipassword = \).*|\1$BITMESSAGE_API_PASSWORD|g" \ -e "s|\(apiport = \).*|\1$BITMESSAGE_API_PORT|g" \