From b1ba1c14e9d21a5804fe822e6f0864429749efc3 Mon Sep 17 00:00:00 2001
From: Winn Johnston <wjohnston@salesforce.com>
Date: Thu, 27 Oct 2016 09:41:30 -0700
Subject: [PATCH] adding in the missing -Des.default.path.repo=$REPO_DIR to 3
 of the init.d scripts

---
 templates/etc/init.d/elasticsearch.Debian.erb  | 2 +-
 templates/etc/init.d/elasticsearch.RedHat.erb  | 2 +-
 templates/etc/init.d/elasticsearch.systemd.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/etc/init.d/elasticsearch.Debian.erb b/templates/etc/init.d/elasticsearch.Debian.erb
index 16489a1b5..9b6af4c9f 100644
--- a/templates/etc/init.d/elasticsearch.Debian.erb
+++ b/templates/etc/init.d/elasticsearch.Debian.erb
@@ -104,7 +104,7 @@ fi
 # Define other required variables
 PID_FILE=/var/run/$NAME.pid
 DAEMON=$ES_HOME/bin/elasticsearch
-DAEMON_OPTS="-d -p $PID_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR"
+DAEMON_OPTS="-d -p $PID_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR -Des.default.path.repo=$REPO_DIR"
 
 export ES_HEAP_SIZE
 export ES_HEAP_NEWSIZE
diff --git a/templates/etc/init.d/elasticsearch.RedHat.erb b/templates/etc/init.d/elasticsearch.RedHat.erb
index ae778521f..f1e1bc2aa 100644
--- a/templates/etc/init.d/elasticsearch.RedHat.erb
+++ b/templates/etc/init.d/elasticsearch.RedHat.erb
@@ -89,7 +89,7 @@ start() {
     fi
     echo -n $"Starting $prog: "
     # if not running, start it up here, usually something like "daemon $exec"
-    daemon --user $ES_USER --pidfile $pidfile $exec -p $pidfile -d -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR
+    daemon --user $ES_USER --pidfile $pidfile $exec -p $pidfile -d -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.work=$WORK_DIR -Des.default.path.conf=$CONF_DIR -Des.default.path.repo=$REPO_DIR
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/templates/etc/init.d/elasticsearch.systemd.erb b/templates/etc/init.d/elasticsearch.systemd.erb
index a7bde5f24..5f919fe1a 100644
--- a/templates/etc/init.d/elasticsearch.systemd.erb
+++ b/templates/etc/init.d/elasticsearch.systemd.erb
@@ -10,7 +10,7 @@ EnvironmentFile=<%= @defaults_location %>/elasticsearch-<%= @name %>
 User=<%= @user %>
 Group=<%= @group %>
 PIDFile=<%= @pid_dir %>/elasticsearch-<%= @name %>.pid
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch -d -p <%= @pid_dir %>/elasticsearch-<%= @name %>.pid -Des.default.path.home=${ES_HOME} -Des.default.path.logs=${LOG_DIR} -Des.default.path.data=${DATA_DIR} -Des.default.path.work=${WORK_DIR} -Des.default.path.conf=${CONF_DIR}
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch -d -p <%= @pid_dir %>/elasticsearch-<%= @name %>.pid -Des.default.path.home=${ES_HOME} -Des.default.path.logs=${LOG_DIR} -Des.default.path.data=${DATA_DIR} -Des.default.path.work=${WORK_DIR} -Des.default.path.conf=${CONF_DIR} -Des.default.path.repo=${REPO_DIR}
 # See MAX_OPEN_FILES in sysconfig
 LimitNOFILE=<%= @nofile %>
 # See MAX_LOCKED_MEMORY in sysconfig, use "infinity" when MAX_LOCKED_MEMORY=unlimited and using bootstrap.mlockall: true