File project.diff of Package elasticsearch5

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package elasticsearch5

--- 0002-Replace-build-variable-in-config-files.patch.orig
+++ 0002-Replace-build-variable-in-config-files.patch
@@ -16,19 +16,22 @@ diff --git a/distribution/src/main/packa
 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
+@@ -6,11 +6,12 @@ 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=ES_JVM_OPTIONS=/etc/elasticsearch/jvm.options
  Environment=LOG_DIR=/var/log/elasticsearch
 -Environment=PID_DIR=/var/run/elasticsearch
+-EnvironmentFile=-${path.env}
 +Environment=PID_DIR=/run/elasticsearch
- EnvironmentFile=-${path.env}
++EnvironmentFile=-/etc/sysconfig/elasticsearch
  
  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
--- elasticsearch.changes.orig
+++ elasticsearch.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu May 23 14:20:27 UTC 2019 - Christian Boltz <suse-beta@cboltz.de>
+
+- fix elasticsearch.service to read the sysconfig file and to use
+  /etc/elasticsearch/jvm.options (instead of /usr/...)
+- update 0002-Replace-build-variable-in-config-files.patch
+
+-------------------------------------------------------------------
 Wed Apr 17 10:34:20 UTC 2019 - Klaus Kämpf <kkaempf@suse.com>
 
 - fix build variables via patch instead of sed in %install

Places

File project.diff of Package elasticsearch5

Places