File 0005-Replace-build-variable-in-config-files.patch of Package elasticsearch6

From f6116c1db12555192fdedc7c657dc6f4925f96ae Mon Sep 17 00:00:00 2001
From: Misha Komarovskiy <zombah@gmail.com>
Date: Thu, 15 Aug 2019 19:40:06 +0300
Subject: [PATCH 5/6] Replace build variable in config files

---
 distribution/packages/src/common/env/elasticsearch     |  2 +-
 .../packages/src/common/systemd/elasticsearch.service  |  4 ++--
 distribution/src/config/elasticsearch.yml              |  4 ++--
 distribution/src/config/jvm.options                    | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/distribution/packages/src/common/env/elasticsearch b/distribution/packages/src/common/env/elasticsearch
index b54f72448bc..27d875e507b 100644
--- a/distribution/packages/src/common/env/elasticsearch
+++ b/distribution/packages/src/common/env/elasticsearch
@@ -9,7 +9,7 @@
 #JAVA_HOME=
 
 # Elasticsearch configuration directory
-ES_PATH_CONF=${path.conf}
+ES_PATH_CONF=/etc/elasticsearch
 
 # Elasticsearch PID directory
 #PID_DIR=/run/elasticsearch
diff --git a/distribution/packages/src/common/systemd/elasticsearch.service b/distribution/packages/src/common/systemd/elasticsearch.service
index 47aff2b7954..c220d6f96a4 100644
--- a/distribution/packages/src/common/systemd/elasticsearch.service
+++ b/distribution/packages/src/common/systemd/elasticsearch.service
@@ -8,9 +8,9 @@ After=network-online.target
 RuntimeDirectory=elasticsearch
 PrivateTmp=true
 Environment=ES_HOME=/usr/share/elasticsearch
-Environment=ES_PATH_CONF=${path.conf}
+Environment=ES_PATH_CONF=/etc/elasticsearch
 Environment=PID_DIR=/run/elasticsearch
-EnvironmentFile=-${path.env}
+EnvironmentFile=-/etc/sysconfig/elasticsearch
 
 WorkingDirectory=/usr/share/elasticsearch
 
diff --git a/distribution/src/config/elasticsearch.yml b/distribution/src/config/elasticsearch.yml
index 445c6f5c07f..ec5e1043664 100644
--- a/distribution/src/config/elasticsearch.yml
+++ b/distribution/src/config/elasticsearch.yml
@@ -30,11 +30,11 @@
 #
 # Path to directory where to store the data (separate multiple locations by comma):
 #
-${path.data}
+path.data: /var/lib/elasticsearch
 #
 # Path to log files:
 #
-${path.logs}
+path.logs: /var/log/elasticsearch
 #
 # ----------------------------------- Memory -----------------------------------
 #
diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
index 5cf20509599..0c3ce7a5704 100644
--- a/distribution/src/config/jvm.options
+++ b/distribution/src/config/jvm.options
@@ -19,8 +19,8 @@
 # Xms represents the initial size of total heap space
 # Xmx represents the maximum size of total heap space
 
--Xms${heap.min}
--Xmx${heap.max}
+-Xms4g
+-Xmx4g
 
 ################################################################
 ## Expert settings
@@ -103,10 +103,10 @@
 
 # specify an alternative path for heap dumps; ensure the directory exists and
 # has sufficient space
-${heap.dump.path}
+#${heap.dump.path}
 
 # specify an alternative path for JVM fatal error logs
-${error.file}
+#${error.file}
 
 ## JDK 8 GC logging
 
@@ -120,7 +120,7 @@ ${error.file}
 8:-XX:GCLogFileSize=64m
 
 # JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=${loggc}:utctime,pid,tags:filecount=32,filesize=64m
+9-:-Xlog:gc*,gc+age=trace,safepoint:file=/var/log/elasticsearch/loggc:utctime,pid,tags:filecount=32,filesize=64m
 # due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
 # time/date parsing will break in an incompatible way for some date patterns and locals
 9-:-Djava.locale.providers=COMPAT
-- 
2.35.1