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

add proxy options to ES_JAVA_OPTS when defined with es_proxy_host

Browse source
This commit is contained in:
Julien Mailleret 2019-12-18 11:57:02 +01:00
parent ac8548503a
commit f1b79129f1
No known key found for this signature in database
GPG key ID: F065093271C8DE71
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tasks/elasticsearch-plugins.yml
View file

@ -75,7 +75,6 @@
CONF_DIR: "{{ es_conf_dir }}"
ES_PATH_CONF: "{{ es_conf_dir }}"
ES_INCLUDE: "{{ default_file }}"
ES_JAVA_OPTS: "{% if item.proxy_host is defined and item.proxy_host != '' and item.proxy_port is defined and item.proxy_port != ''%} -Dhttp.proxyHost={{ item.proxy_host }} -Dhttp.proxyPort={{ item.proxy_port }} -Dhttps.proxyHost={{ item.proxy_host }} -Dhttps.proxyPort={{ item.proxy_port }} {% elif es_proxy_host is defined and es_proxy_host != '' %} -Dhttp.proxyHost={{ es_proxy_host }} -Dhttp.proxyPort={{ es_proxy_port }} -Dhttps.proxyHost={{ es_proxy_host }} -Dhttps.proxyPort={{ es_proxy_port }} {% endif %}"
until: plugin_installed.rc == 0
retries: 5
delay: 5

2
templates/elasticsearch.j2
View file

@ -15,7 +15,7 @@ ES_PATH_CONF={{ es_conf_dir }}
PID_DIR={{ es_pid_dir }}
# Additional Java OPTS
ES_JAVA_OPTS=
ES_JAVA_OPTS="{% if es_proxy_host is defined and es_proxy_host != '' %}-Dhttp.proxyHost={{ es_proxy_host }} -Dhttp.proxyPort={{ es_proxy_port }} -Dhttps.proxyHost={{ es_proxy_host }} -Dhttps.proxyPort={{ es_proxy_port }}{% endif %}"
# Configure restart on package upgrade (true, every other setting will lead to not restarting)
#RESTART_ON_UPGRADE=true