File 0002-Replace-build-variable-in-config-files.patch of Package elasticsearch5

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Replace-build-variable-in-config-files.patch of Package elasticsearch5

From b2ed6978dd6885d692714bf28e8f0172a3cf79ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 17 Apr 2019 12:30:37 +0200
Subject: [PATCH 2/2] Replace build variable in config files

Since neither buildDeb nor buildRpm work without major efforts - which
would do this replacement - it's way simpler to patch the sources.

Not nice, but effective.
---
 distribution/src/main/packaging/systemd/elasticsearch.service | 4 ++--
 distribution/src/main/resources/config/jvm.options            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distribution/src/main/packaging/systemd/elasticsearch.service b/distribution/src/main/packaging/systemd/elasticsearch.service
index 45b741779f79..9dd0781f90f1 100644
--- a/distribution/src/main/packaging/systemd/elasticsearch.service
+++ b/distribution/src/main/packaging/systemd/elasticsearch.service
@@ -6,10 +6,10 @@ After=network-online.target
 
 [Service]
 Environment=ES_HOME=/usr/share/elasticsearch
-Environment=CONF_DIR=${path.conf}
+Environment=CONF_DIR=/etc/elasticsearch
 Environment=DATA_DIR=/var/lib/elasticsearch
 Environment=LOG_DIR=/var/log/elasticsearch
-Environment=PID_DIR=/var/run/elasticsearch
+Environment=PID_DIR=/run/elasticsearch
 EnvironmentFile=-${path.env}
 
 WorkingDirectory=/usr/share/elasticsearch
diff --git a/distribution/src/main/resources/config/jvm.options b/distribution/src/main/resources/config/jvm.options
index a14f5ad33a07..0efdf8f5d360 100644
--- a/distribution/src/main/resources/config/jvm.options
+++ b/distribution/src/main/resources/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
-- 
2.21.0

Places

File 0002-Replace-build-variable-in-config-files.patch of Package elasticsearch5

Places