Merge branch 'master' into master

This commit is contained in:
Alex Root Junior 2024-10-21 00:23:56 +03:00 committed by GitHub
commit 0096d99a86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions

View File

@ -27,12 +27,10 @@ Enable statistics HTTP endpoint.
Usage: `-e TELEGRAM_STAT=1 -p 8082:8082` and then check that `curl http://<host>:8082` returns server statistic Usage: `-e TELEGRAM_STAT=1 -p 8082:8082` and then check that `curl http://<host>:8082` returns server statistic
### `TELEGRAM_FILTER` ### `TELEGRAM_FILTER`
"<remainder>/<modulo>". Allow only bots with 'bot_user_id % modulo == remainder' "<remainder>/<modulo>". Allow only bots with 'bot_user_id % modulo == remainder'
### `TELEGRAM_MAX_WEBHOOK_CONNECTIONS` ### `TELEGRAM_MAX_WEBHOOK_CONNECTIONS`
default value of the maximum webhook connections per bot default value of the maximum webhook connections per bot
@ -61,6 +59,12 @@ allow the Bot API server to serve local requests
Use the `TELEGRAM_HTTP_IP_ADDRESS: "[::]"` parameter to listen on the ipv6 intranet Use the `TELEGRAM_HTTP_IP_ADDRESS: "[::]"` parameter to listen on the ipv6 intranet
### `TELEGRAM_HTTP_PORT`
Set which port the api server should listen to if you want to run the image in network mode as host and want to change the port.
If not set then the api server will listen to port 8081.
## Start with persistent storage ## Start with persistent storage
Server working directory is `/var/lib/telegram-bot-api` so if you want to persist the server data you can mount this folder as volume: Server working directory is `/var/lib/telegram-bot-api` so if you want to persist the server data you can mount this folder as volume:

View File

@ -41,7 +41,7 @@ fi
file_env "TELEGRAM_API_ID" "TELEGRAM_API_ID_FILE" file_env "TELEGRAM_API_ID" "TELEGRAM_API_ID_FILE"
file_env "TELEGRAM_API_HASH" "TELEGRAM_API_HASH_FILE" file_env "TELEGRAM_API_HASH" "TELEGRAM_API_HASH_FILE"
DEFAULT_ARGS="--http-port 8081 --dir=${TELEGRAM_WORK_DIR} --temp-dir=${TELEGRAM_TEMP_DIR} --username=${USERNAME} --groupname=${GROUPNAME}" DEFAULT_ARGS="--dir=${TELEGRAM_WORK_DIR} --temp-dir=${TELEGRAM_TEMP_DIR} --username=${USERNAME} --groupname=${GROUPNAME}"
CUSTOM_ARGS="" CUSTOM_ARGS=""
if [ -n "$TELEGRAM_LOG_FILE" ]; then if [ -n "$TELEGRAM_LOG_FILE" ]; then
@ -72,6 +72,13 @@ if [ -n "$TELEGRAM_HTTP_IP_ADDRESS" ]; then
CUSTOM_ARGS="${CUSTOM_ARGS} --http-ip-address=$TELEGRAM_HTTP_IP_ADDRESS" CUSTOM_ARGS="${CUSTOM_ARGS} --http-ip-address=$TELEGRAM_HTTP_IP_ADDRESS"
fi fi
# Set http-port arg
if [ -n "$TELEGRAM_HTTP_PORT" ]; then
CUSTOM_ARGS="${CUSTOM_ARGS} --http-port=$TELEGRAM_HTTP_PORT"
else
CUSTOM_ARGS="${CUSTOM_ARGS} --http-port=8081"
fi
COMMAND="telegram-bot-api ${DEFAULT_ARGS}${CUSTOM_ARGS}" COMMAND="telegram-bot-api ${DEFAULT_ARGS}${CUSTOM_ARGS}"
echo "$COMMAND" echo "$COMMAND"