santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "SSL support optimisation"

Browse source 
This reverts commit 80baf268e5.
This commit is contained in:
Jeffrey Everling 2018-05-05 07:56:16 +02:00
parent 40e5252ff4
commit ba080bc3c8
2 changed files with 53 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

23
templates/elasticsearch.yml.j2
View file

@ -57,25 +57,19 @@ xpack.graph.enabled: false
{% endif %}
{% endif %}
{% if es_ssl_config is defined %}
{% if es_ssl_config['enabled'] is defined %}
xpack.security.transport.ssl.enabled: true
xpack.security.http.ssl.enabled: true
xpack.security.http.ssl.keystore.path: "{{ es_ssl_config['keystore'] }}"
{% if es_ssl_config['keystore_password'] is defined and es_ssl_config['legacy_password_config'] %}
xpack.security.http.ssl.keystore.path: {{conf_dir}}/ssl/{{es_ssl_config['dns']}}.p12
#Legacy config required for /usr/share/elasticsearch/bin/x-pack/setup-passwords
xpack.security.http.ssl.keystore.password: "{{ es_ssl_config['keystore_password'] }}"
{% endif %}
xpack.security.http.ssl.truststore.path: "{{ es_ssl_config['truststore'] }}"
{% if es_ssl_config['truststore_password'] is defined and es_ssl_config['legacy_password_config'] %}
xpack.security.http.ssl.keystore.password: "test"
xpack.security.http.ssl.truststore.path: {{conf_dir}}/ssl/{{es_ssl_config['dns']}}.p12
#Legacy config required for /usr/share/elasticsearch/bin/x-pack/setup-passwords
xpack.security.http.ssl.truststore.password: "{{ es_ssl_config['truststore_password'] }}"
{% endif %}
{% if es_ssl_config['client_authentication'] is defined %}
xpack.security.http.ssl.client_authentication: {{ es_ssl_config['client_authentication'] }}
{% endif %}
xpack.security.http.ssl.truststore.password: "test"
xpack.security.http.ssl.client_authentication: none
{% endif %}
{% if es_mail_config is defined %}
{% if es_mail_config['account'] is defined %}
xpack.notification.email:
account:
{{ es_mail_config['account'] }}:
@ -89,5 +83,6 @@ xpack.notification.email:
{% if es_mail_config['require_auth'] == true %}
user: {{ es_mail_config['user'] }}
password: {{ es_mail_config['pass'] }}
{% endif %}
{% endif %}
{% endif %}