diff --git a/readme-vars.yml b/readme-vars.yml index a87699b..053cdc1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -31,8 +31,8 @@ param_env_vars: - { env_var: "REDIS_HOST", env_value: "redis", desc: "Redis host (optional)"} - { env_var: "REDIS_PORT", env_value: "6379", desc: "Redis port (optional)"} - { env_var: "ES_HOST", env_value: "elasticsearch", desc: "ElasticSearch host (optional)"} - - { env_var: "ES_PORT", env_value: "6379", desc: "ElasticSearch port (optional)"} - - { env_var: "ES_USER", env_value: "elasticsearch", desc: "ElasticSearch username (optional)"} + - { env_var: "ES_PORT", env_value: "9200", desc: "ElasticSearch port (optional)"} + - { env_var: "ES_USER", env_value: "elastic", desc: "ElasticSearch username (optional)"} - { env_var: "ES_PASS", env_value: "changeme", desc: "ElasticSearch password (optional)"} - { env_var: "INDEX_NAME", env_value: "diskover-", desc: "Index name prefix (optional)"} - { env_var: "DISKOVER_OPTS", env_value: "", desc: "Optional arguments to pass to the diskover crawler (optional)"} diff --git a/root/app/dispatcher.sh b/root/app/dispatcher.sh index 11a2a23..9f4fda1 100644 --- a/root/app/dispatcher.sh +++ b/root/app/dispatcher.sh @@ -24,9 +24,7 @@ fi # empty existing redis queue echo "emptying current redis queues..." -rq empty -u redis://${DISKOVER_ARRAY[REDIS_HOST]}:${DISKOVER_ARRAY[REDIS_PORT]} diskover_crawl -sleep 3 -rq empty -u redis://${DISKOVER_ARRAY[REDIS_HOST]}:${DISKOVER_ARRAY[REDIS_PORT]} failed +rq empty -u redis://${DISKOVER_ARRAY[REDIS_HOST]}:${DISKOVER_ARRAY[REDIS_PORT]} diskover_crawl diskover diskover_calcdir failed sleep 3 echo "killing dangling workers..."