File 0004-var-run-run.patch of Package elasticsearch6

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-var-run-run.patch of Package elasticsearch6

From 88a4657c940209bdf4e7e0211ffd2a22a688e816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Sat, 29 Dec 2018 13:50:14 +0100
Subject: [PATCH 4/6] /var/run -> /run

---
 distribution/packages/build.gradle                            | 2 +-
 distribution/packages/src/common/env/elasticsearch            | 2 +-
 distribution/packages/src/common/scripts/postrm               | 4 ++--
 distribution/packages/src/common/systemd/elasticsearch.conf   | 2 +-
 .../packages/src/common/systemd/elasticsearch.service         | 2 +-
 distribution/packages/src/deb/init.d/elasticsearch            | 2 +-
 distribution/packages/src/rpm/init.d/elasticsearch            | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
index 6d2739ce1c5..701ecbadb72 100644
--- a/distribution/packages/build.gradle
+++ b/distribution/packages/build.gradle
@@ -77,7 +77,7 @@ void addProcessFilesTask(String type, boolean oss) {
 
     doLast {
       // create empty dirs, we set the permissions when configuring the packages
-      mkdir "${packagingFiles}/var/run/elasticsearch"
+      mkdir "${packagingFiles}/run/elasticsearch"
       mkdir "${packagingFiles}/var/log/elasticsearch"
       mkdir "${packagingFiles}/var/lib/elasticsearch"
       mkdir "${packagingFiles}/usr/share/elasticsearch/plugins"
diff --git a/distribution/packages/src/common/env/elasticsearch b/distribution/packages/src/common/env/elasticsearch
index 76d9473b0fb..b54f72448bc 100644
--- a/distribution/packages/src/common/env/elasticsearch
+++ b/distribution/packages/src/common/env/elasticsearch
@@ -12,7 +12,7 @@
 ES_PATH_CONF=${path.conf}
 
 # Elasticsearch PID directory
-#PID_DIR=/var/run/elasticsearch
+#PID_DIR=/run/elasticsearch
 
 # Additional Java OPTS
 #ES_JAVA_OPTS=
diff --git a/distribution/packages/src/common/scripts/postrm b/distribution/packages/src/common/scripts/postrm
index a3cb5e1208f..3540ffaa42a 100644
--- a/distribution/packages/src/common/scripts/postrm
+++ b/distribution/packages/src/common/scripts/postrm
@@ -55,9 +55,9 @@ if [ "$REMOVE_DIRS" = "true" ]; then
         echo " OK"
     fi
 
-    if [ -d /var/run/elasticsearch ]; then
+    if [ -d /run/elasticsearch ]; then
         echo -n "Deleting PID directory..."
-        rm -rf /var/run/elasticsearch
+        rm -rf /run/elasticsearch
         echo " OK"
     fi
 
diff --git a/distribution/packages/src/common/systemd/elasticsearch.conf b/distribution/packages/src/common/systemd/elasticsearch.conf
index d079f28b995..9db225e74a7 100644
--- a/distribution/packages/src/common/systemd/elasticsearch.conf
+++ b/distribution/packages/src/common/systemd/elasticsearch.conf
@@ -1 +1 @@
-d    /var/run/elasticsearch   0755 elasticsearch elasticsearch - -
+d    /run/elasticsearch   0755 elasticsearch elasticsearch - -
diff --git a/distribution/packages/src/common/systemd/elasticsearch.service b/distribution/packages/src/common/systemd/elasticsearch.service
index a03f1befdb7..47aff2b7954 100644
--- a/distribution/packages/src/common/systemd/elasticsearch.service
+++ b/distribution/packages/src/common/systemd/elasticsearch.service
@@ -9,7 +9,7 @@ RuntimeDirectory=elasticsearch
 PrivateTmp=true
 Environment=ES_HOME=/usr/share/elasticsearch
 Environment=ES_PATH_CONF=${path.conf}
-Environment=PID_DIR=/var/run/elasticsearch
+Environment=PID_DIR=/run/elasticsearch
 EnvironmentFile=-${path.env}
 
 WorkingDirectory=/usr/share/elasticsearch
diff --git a/distribution/packages/src/deb/init.d/elasticsearch b/distribution/packages/src/deb/init.d/elasticsearch
index 72eb635bba3..253753620f2 100755
--- a/distribution/packages/src/deb/init.d/elasticsearch
+++ b/distribution/packages/src/deb/init.d/elasticsearch
@@ -51,7 +51,7 @@ ES_PATH_CONF=/etc/$NAME
 MAX_MAP_COUNT=262144
 
 # Elasticsearch PID file directory
-PID_DIR="/var/run/elasticsearch"
+PID_DIR="/run/elasticsearch"
 
 # End of variables that can be overwritten in $DEFAULT
 
diff --git a/distribution/packages/src/rpm/init.d/elasticsearch b/distribution/packages/src/rpm/init.d/elasticsearch
index 99d8ef45ef6..dba2d0eead7 100644
--- a/distribution/packages/src/rpm/init.d/elasticsearch
+++ b/distribution/packages/src/rpm/init.d/elasticsearch
@@ -37,7 +37,7 @@ MAX_OPEN_FILES=65535
 MAX_MAP_COUNT=262144
 ES_PATH_CONF="${path.conf}"
 
-PID_DIR="/var/run/elasticsearch"
+PID_DIR="/run/elasticsearch"
 
 # Source the default env file
 ES_ENV_FILE="${path.env}"
-- 
2.35.1

Places

File 0004-var-run-run.patch of Package elasticsearch6

Places