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

Merge pull request #136 from bobbrez/bobbrez/fix-upstart-script

Browse source 
Make the Upstart script consistent with the systemd script
This commit is contained in:
Dale McDiarmid 2016-08-29 16:43:23 +01:00 • committed by GitHub
commit 19fde303e7
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
templates/init/debian/elasticsearch.j2
View file

@ -45,11 +45,11 @@ fi
# The following variables can be overwritten in $DEFAULT # The following variables can be overwritten in $DEFAULT
# Run Elasticsearch as this user ID and group ID # Run Elasticsearch as this user ID and group ID
ES_USER=elasticsearch ES_USER={{es_user}}
ES_GROUP=elasticsearch ES_GROUP={{es_group}}
# Directory where the Elasticsearch binary distribution resides # Directory where the Elasticsearch binary distribution resides
ES_HOME=/usr/share/$NAME ES_HOME={{es_home}}
# Heap size defaults to 256m min, 1g max # Heap size defaults to 256m min, 1g max
# Set ES_HEAP_SIZE to 50% of available RAM, but no more than 31g # Set ES_HEAP_SIZE to 50% of available RAM, but no more than 31g
@ -71,13 +71,13 @@ MAX_OPEN_FILES=65535
#MAX_LOCKED_MEMORY= #MAX_LOCKED_MEMORY=
# Elasticsearch log directory # Elasticsearch log directory
LOG_DIR=/var/log/$NAME LOG_DIR={{log_dir}}
# Elasticsearch data directory # Elasticsearch data directory
DATA_DIR=/var/lib/$NAME DATA_DIR={{ data_dirs | array_to_str }}
# Elasticsearch configuration directory # Elasticsearch configuration directory
CONF_DIR=/etc/$NAME CONF_DIR={{conf_dir}}
# Maximum number of VMA (Virtual Memory Areas) a process can own # Maximum number of VMA (Virtual Memory Areas) a process can own
MAX_MAP_COUNT=262144 MAX_MAP_COUNT=262144
@ -86,7 +86,7 @@ MAX_MAP_COUNT=262144
#ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log #ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log
# Elasticsearch PID file directory # Elasticsearch PID file directory
PID_DIR="/var/run/elasticsearch" PID_DIR={{pid_dir}}
# End of variables that can be overwritten in $DEFAULT # End of variables that can be overwritten in $DEFAULT
@ -103,7 +103,7 @@ fi
# Define other required variables # Define other required variables
PID_FILE="$PID_DIR/$NAME.pid" PID_FILE="$PID_DIR/$NAME.pid"
DAEMON=$ES_HOME/bin/elasticsearch DAEMON={{es_home}}/bin/elasticsearch
DAEMON_OPTS="-d -p $PID_FILE --default.path.home=$ES_HOME --default.path.logs=$LOG_DIR --default.path.data=$DATA_DIR --default.path.conf=$CONF_DIR" DAEMON_OPTS="-d -p $PID_FILE --default.path.home=$ES_HOME --default.path.logs=$LOG_DIR --default.path.data=$DATA_DIR --default.path.conf=$CONF_DIR"
export ES_HEAP_SIZE export ES_HEAP_SIZE
@ -227,4 +227,4 @@ case "$1" in
;; ;;
esac esac
exit 0 exit 0