Merge branch 'master' of github.com:elastic/ansible-elasticsearch

This commit is contained in:
Jakob Reiter 2016-03-22 12:45:56 +01:00
commit fcabe4ed1f
22 changed files with 288 additions and 75 deletions

View file

@ -9,7 +9,7 @@ ES_HOME={{es_home}}
CONF_DIR={{conf_dir}}
# Elasticsearch data directory
DATA_DIR={{data_dir}}
DATA_DIR={{ data_dirs | array_to_str }}
# Elasticsearch logs directory
LOG_DIR={{log_dir}}

View file

@ -16,7 +16,7 @@ node.name: {{inventory_hostname}}-{{es_instance_name}}
# Path to directory containing configuration (this file and logging.yml):
path.conf: {{ conf_dir }}
path.data: {{ data_dir }}
path.data: {{ data_dirs | array_to_str }}
path.work: {{ work_dir }}

View file

@ -10,7 +10,7 @@
# Modified by Nicolas Huray for Elasticsearch <nicolas.huray@gmail.com>.
#
### BEGIN INIT INFO
# Provides: elasticsearch
# Provides: {{es_instance_name}}_{{default_file | basename}}
# Required-Start: $network $remote_fs $named
# Required-Stop: $network $remote_fs $named
# Default-Start: 2 3 4 5

View file

@ -7,7 +7,7 @@ After=network-online.target
[Service]
Environment=ES_HOME={{es_home}}
Environment=CONF_DIR={{conf_dir}}
Environment=DATA_DIR={{data_dir}}
Environment=DATA_DIR={{ data_dirs | array_to_str }}
Environment=LOG_DIR={{log_dir}}
Environment=PID_DIR={{pid_dir}}
EnvironmentFile=-{{instance_default_file}}