2.0 Support + Plugin Directory Support + Supporting Tests + Defaults Change

templates/systemd/elasticsearch.j2

@@ -6,8 +6,7 @@ After=network-online.target
 
 [Service]
 Environment=ES_HOME={{es_home}}
-Environment=CONF_DIR={{instance_config_directory}}
-Environment=CONF_FILE={{instance_config_directory}}/elasticsearch.yml
+Environment=CONF_DIR={{conf_dir}}
 Environment=DATA_DIR={{data_dir}}
 Environment=LOG_DIR={{log_dir}}
 Environment=PID_DIR={{pid_dir}}
@@ -17,12 +16,13 @@ User={{es_user}}
 Group={{es_group}}
 
 ExecStart={{es_home}}/bin/elasticsearch \
-                                                -Des.pidfile=$PID_DIR/elasticsearch.pid \
-                                                -Des.default.path.home=$ES_HOME \
-                                                -Des.default.path.logs=$LOG_DIR \
-                                                -Des.default.path.data=$DATA_DIR \
-                                                -Des.default.config=$CONF_FILE \
-                                                -Des.default.path.conf=$CONF_DIR
+                                        -Des.pidfile=${PID_DIR}/elasticsearch.pid \
+                                        -Des.default.path.home=${ES_HOME} \
+                                        -Des.default.path.logs=${LOG_DIR} \
+                                        -Des.default.path.data=${DATA_DIR} \
+                                        -Des.default.path.conf=${CONF_DIR}
+
+
 
 # Connects standard output to /dev/null
 StandardOutput=null
@@ -30,9 +30,6 @@ StandardOutput=null
 # Connects standard error to journal
 StandardError=journal
 
-# When a JVM receives a SIGTERM signal it exits with code 143
-SuccessExitStatus=143
-
 # Specifies the maximum file descriptor number that can be opened by this process
 LimitNOFILE=65535
 
@@ -43,8 +40,17 @@ LimitNOFILE=65535
 LimitMEMLOCK=infinity
 {% endif %}
 
-# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
-TimeoutStopSec=20
+# Disable timeout logic and wait until process is stopped
+TimeoutStopSec=0
+
+# SIGTERM signal is used to stop the Java process
+KillSignal=SIGTERM
+
+# Java process is never killed
+SendSIGKILL=no
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
 
 [Install]
 WantedBy=multi-user.target