diff options
author | 2019-03-05 10:30:33 +0000 | |
---|---|---|
committer | 2019-03-05 14:55:20 +0000 | |
commit | cfb49dbeb4a5509d1bfe529926eaeab568a3bcca (patch) | |
tree | 46c4eb27278449d02934db2e61bf52b68392c563 /charts/aai-elasticsearch/resources/bin | |
parent | 28c2643a31109f19b54dbf3e7f6594eafdb50b52 (diff) |
Add Searchguard OOM config to ElasticSearch
Change-Id: I3c4d0c82882b2f064a6ad3610c0f699d8af50632
Issue-ID: AAI-2203
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Diffstat (limited to 'charts/aai-elasticsearch/resources/bin')
-rw-r--r-- | charts/aai-elasticsearch/resources/bin/init_sg.sh | 11 | ||||
-rw-r--r-- | charts/aai-elasticsearch/resources/bin/run.sh | 8 | ||||
-rw-r--r-- | charts/aai-elasticsearch/resources/bin/wait_until_started.sh | 9 |
3 files changed, 28 insertions, 0 deletions
diff --git a/charts/aai-elasticsearch/resources/bin/init_sg.sh b/charts/aai-elasticsearch/resources/bin/init_sg.sh new file mode 100644 index 0000000..e859365 --- /dev/null +++ b/charts/aai-elasticsearch/resources/bin/init_sg.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +/usr/share/elasticsearch/plugins/search-guard-6/tools/sgadmin.sh \ + -cd /usr/share/elasticsearch/config/sg \ + -ks /usr/share/elasticsearch/config/sg/auth/{{ .Values.config.adminKeyStore }} \ + -ts /usr/share/elasticsearch/config/sg/auth/{{ .Values.config.trustStore }} \ + -kspass {{ .Values.config.adminKeyStorePassword }} \ + -tspass {{ .Values.config.trustStorePassword}} \ + -nhnv \ + -icl \ + -p {{ .Values.service.internalPort2 }}
\ No newline at end of file diff --git a/charts/aai-elasticsearch/resources/bin/run.sh b/charts/aai-elasticsearch/resources/bin/run.sh new file mode 100644 index 0000000..a612c74 --- /dev/null +++ b/charts/aai-elasticsearch/resources/bin/run.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Wait for ES to start then initialize SearchGuard +/usr/local/bin/docker-entrypoint.sh eswrapper & +/usr/share/elasticsearch/bin/wait_until_started.sh +/usr/share/elasticsearch/bin/init_sg.sh + +wait
\ No newline at end of file diff --git a/charts/aai-elasticsearch/resources/bin/wait_until_started.sh b/charts/aai-elasticsearch/resources/bin/wait_until_started.sh new file mode 100644 index 0000000..279253b --- /dev/null +++ b/charts/aai-elasticsearch/resources/bin/wait_until_started.sh @@ -0,0 +1,9 @@ +#!/bin/sh +RET=1 + +while [[ RET -ne 0 ]]; do + echo "Waiting for Elasticsearch to become ready before running sgadmin..." + curl -XGET -k "https://localhost:{{ .Values.service.internalPort }}/" >/dev/null 2>&1 + RET=$? + sleep 5 +done
\ No newline at end of file |