Skip to content

Commit 83d644d

Browse files
committed
Removed disable of xpack.security
1 parent e590e04 commit 83d644d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

Diff for: .ci/Dockerfile.elasticsearch

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ RUN rm -f $es_path/config/scripts
1111
COPY --chown=elasticsearch:elasticsearch spec/fixtures/test_certs/* $es_path/config/test_certs/
1212
COPY --chown=elasticsearch:elasticsearch .ci/elasticsearch-run.sh $es_path/
1313

14-
RUN echo "xpack.security.enabled: false" >> $es_yml
15-
1614
RUN if [ "$SECURE_INTEGRATION" = "true" ] ; then echo "xpack.security.http.ssl.enabled: $SECURE_INTEGRATION" >> $es_yml; fi
1715
RUN if [ "$SECURE_INTEGRATION" = "true" ] ; then echo "xpack.security.http.ssl.key: $es_path/config/test_certs/test.key" >> $es_yml; fi
1816
RUN if [ "$SECURE_INTEGRATION" = "true" ] ; then echo "xpack.security.http.ssl.certificate: $es_path/config/test_certs/test.crt" >> $es_yml; fi

Diff for: lib/logstash/outputs/elasticsearch/http_client/pool.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def elasticsearch?(url)
297297

298298
def valid_tagline?(version_info)
299299
tagline = version_info['tagline']
300-
tagline == "You Know, for Search"
300+
tagline == "You Know, for Search"
301301
end
302302

303303
def stop_resurrectionist

0 commit comments

Comments
 (0)