diff --git a/README.md b/README.md index 544e594..f1a6ee3 100644 --- a/README.md +++ b/README.md @@ -100,10 +100,7 @@ For various reasons it may be desirable to block or filtering content from claim - `--host` Interface for server to listen on, use 0.0.0.0 to listen on the external interface. Can be set from the environment with `HOST` - `--tcp_port` Electrum TCP port to listen on for hub server. Can be set from the environment with `TCP_PORT` - `--udp_port` UDP port to listen on for hub server. Can be set from the environment with `UDP_PORT` - - `--elastic_host` Hostname or ip address of the elasticsearch instance to connect to. Can be set from the environment with `ELASTIC_HOST` - - `--elastic_port` Elasticsearch port to connect to. Can be set from the environment with `ELASTIC_PORT` - - `--elastic_notifier_host` Elastic sync notifier host to connect to, defaults to localhost. Can be set from the environment with `ELASTIC_NOTIFIER_HOST` - - `--elastic_notifier_port` Elastic sync notifier port to connect using. Can be set from the environment with `ELASTIC_NOTIFIER_PORT` + - `--elastic_services` Comma separated list of items in the format `elastic_host:elastic_port/notifier_host:notifier_port`. Can be set from the environment with `ELASTIC_SERVICES` - `--query_timeout_ms` Timeout for claim searches in elasticsearch in milliseconds. Can be set from the environment with `QUERY_TIMEOUT_MS` - `--blocking_channel_ids` Space separated list of channel claim ids used for blocking. Claims that are reposted by these channels can't be resolved or returned in search results. Can be set from the environment with `BLOCKING_CHANNEL_IDS`. - `--filtering_channel_ids` Space separated list of channel claim ids used for blocking. Claims that are reposted by these channels aren't returned in search results. Can be set from the environment with `FILTERING_CHANNEL_IDS` diff --git a/docs/docker_examples/docker-compose.yml b/docs/docker_examples/docker-compose.yml index 6f6b6f8..6de55f3 100644 --- a/docs/docker_examples/docker-compose.yml +++ b/docs/docker_examples/docker-compose.yml @@ -35,14 +35,12 @@ services: - "lbry_rocksdb:/database" environment: - HUB_COMMAND=scribe-elastic-sync - - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 - - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 + - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 d4612c256a44fc025c37a875751415299b1f8220 + - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 145265bd234b7c9c28dfc6857d878cca402dda94 22335fbb132eee86d374b613875bf88bec83492f f665b89b999f411aa5def311bb2eb385778d49c8 command: # for full options, see `scribe-elastic-sync --help` - "--max_query_workers=2" - "--elastic_host=127.0.0.1" # elasticsearch host - "--elastic_port=9200" # elasticsearch port - - "--elastic_notifier_host=127.0.0.1" # address for the elastic sync notifier to connect to - - "--elastic_notifier_port=19080" herald: depends_on: - lbcd @@ -58,18 +56,15 @@ services: - "lbry_rocksdb:/database" environment: - HUB_COMMAND=herald - - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 - - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 + - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 d4612c256a44fc025c37a875751415299b1f8220 + - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 145265bd234b7c9c28dfc6857d878cca402dda94 22335fbb132eee86d374b613875bf88bec83492f f665b89b999f411aa5def311bb2eb385778d49c8 command: # for full options, see `herald --help` - "--index_address_statuses" - "--daemon_url=http://lbry:lbry@127.0.0.1:9245" - "--max_query_workers=4" - "--host=0.0.0.0" + - "--elastic_services=127.0.0.1:9200/127.0.0.1:19080" - "--prometheus_port=2112" # comment out to disable prometheus metrics - # - "--elastic_host=127.0.0.1" # elasticsearch host - # - "--elastic_port=9200" # elasticsearch port - # - "--elastic_notifier_host=127.0.0.1" # address for the elastic sync notifier to connect to - # - "--elastic_notifier_port=19080" # - "--max_sessions=100000 # uncomment to increase the maximum number of electrum connections, defaults to 1000 # - "--allow_lan_udp" # uncomment to reply to clients on the local network es01: diff --git a/docs/docker_examples/hub-compose.yml b/docs/docker_examples/hub-compose.yml index 7cfbed8..d7642d3 100644 --- a/docs/docker_examples/hub-compose.yml +++ b/docs/docker_examples/hub-compose.yml @@ -29,8 +29,8 @@ services: - "lbry_rocksdb:/database" environment: - HUB_COMMAND=scribe-elastic-sync - - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 - - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 + - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 d4612c256a44fc025c37a875751415299b1f8220 + - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 145265bd234b7c9c28dfc6857d878cca402dda94 22335fbb132eee86d374b613875bf88bec83492f f665b89b999f411aa5def311bb2eb385778d49c8 command: - "--elastic_host=127.0.0.1" - "--elastic_port=9200" @@ -49,12 +49,11 @@ services: - "lbry_rocksdb:/database" environment: - HUB_COMMAND=herald - - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 - - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 + - FILTERING_CHANNEL_IDS=770bd7ecba84fd2f7607fb15aedd2b172c2e153f 95e5db68a3101df19763f3a5182e4b12ba393ee8 d4612c256a44fc025c37a875751415299b1f8220 + - BLOCKING_CHANNEL_IDS=dd687b357950f6f271999971f43c785e8067c3a9 06871aa438032244202840ec59a469b303257cad b4a2528f436eca1bf3bf3e10ff3f98c57bd6c4c6 145265bd234b7c9c28dfc6857d878cca402dda94 22335fbb132eee86d374b613875bf88bec83492f f665b89b999f411aa5def311bb2eb385778d49c8 command: - "--daemon_url=http://lbry:lbry@127.0.0.1:9245" - - "--elastic_host=127.0.0.1" - - "--elastic_port=9200" + - "--elastic_services=127.0.0.1:9200/127.0.0.1:19080" - "--max_query_workers=4" - "--host=0.0.0.0" - "--max_sessions=100000"