Add properties files to configure startup and installation scripts

Many scripts are used to start/stop and install/uninstall elasticsearch. These scripts share a lot of configuration properties like directory paths, max value for a setting, default user etc. Most of the values are identical but some of them are different depending of the platform (Debian-based or Redhat-based OS), depending of the way elasticsearch is started (shell script, systemd, sysv-init...) or the way it is installed (zip, rpm, deb...). Today the values are duplicated in multiple places, making it difficult to maintain the scripts or to update a value.

This pull request make this more uniform: values used in scripts must be defined in a common packaging.properties file. Each value can be overridden in another specific packaging.properties file for Debian or Redhat. All startup and installation scripts are filtered with the common then the custom packaging.properties files before being packaged as a zip/tar.gz/rpm/dpkf archive.

Author: tlrx

bin/elasticsearch.in.bat

@@ -14,11 +14,11 @@ for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI
 REM ***** JAVA options *****
 
 if "%ES_MIN_MEM%" == "" (
-set ES_MIN_MEM=256m
+set ES_MIN_MEM=${packaging.elasticsearch.heap.min}
 )
 
 if "%ES_MAX_MEM%" == "" (
-set ES_MAX_MEM=1g
+set ES_MAX_MEM=${packaging.elasticsearch.heap.max}
 )
 
 if NOT "%ES_HEAP_SIZE%" == "" (

bin/elasticsearch.in.sh

@@ -3,10 +3,10 @@
 ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/lib/${project.build.finalName}.jar:$ES_HOME/lib/*:$ES_HOME/lib/sigar/*"
 
 if [ "x$ES_MIN_MEM" = "x" ]; then
-    ES_MIN_MEM=256m
+    ES_MIN_MEM=${packaging.elasticsearch.heap.min}
 fi
 if [ "x$ES_MAX_MEM" = "x" ]; then
-    ES_MAX_MEM=1g
+    ES_MAX_MEM=${packaging.elasticsearch.heap.max}
 fi
 if [ "x$ES_HEAP_SIZE" != "x" ]; then
     ES_MIN_MEM=$ES_HEAP_SIZE

bin/service.bat

@@ -118,8 +118,8 @@ goto:eof
 )
 
 :foundJVM
-if "%ES_MIN_MEM%" == "" set ES_MIN_MEM=256m
-if "%ES_MAX_MEM%" == "" set ES_MAX_MEM=1g
+if "%ES_MIN_MEM%" == "" set ES_MIN_MEM=${packaging.elasticsearch.heap.min}
+if "%ES_MAX_MEM%" == "" set ES_MAX_MEM=${packaging.elasticsearch.heap.max}
 
 if NOT "%ES_HEAP_SIZE%" == "" set ES_MIN_MEM=%ES_HEAP_SIZE%
 if NOT "%ES_HEAP_SIZE%" == "" set ES_MAX_MEM=%ES_HEAP_SIZE%

pom.xml

@@ -0,0 +1,11 @@
+# Common properties for building ZIP,GZ,RPM and DEB packages
+#
+# Properties defined here can be overridden with specific settings,
+# like in rpm/packaging.properties and deb/packaging.properties.
+
+# Default values for min/max heap memory allocated to elasticsearch java process
+packaging.elasticsearch.heap.min=256m
+packaging.elasticsearch.heap.max=1g
+
+# Simple marker to check that properties are correctly overridden
+packaging.type=tar.gz,gzip

src/packaging/common/packaging.properties

@@ -15,7 +15,9 @@ case "$1" in
         rm -rf /usr/share/elasticsearch/plugins
 
         # Remove **only** empty data dir
-        rmdir --ignore-fail-on-non-empty /var/lib/elasticsearch
+        if [ -d /var/lib/elasticsearch ]; then
+            rmdir --ignore-fail-on-non-empty /var/lib/elasticsearch
+        fi
     ;;
 
     purge)

src/deb/control/conffiles renamed to src/packaging/deb/control/conffiles

@@ -0,0 +1,5 @@
+# Properties used to build to the DEB package
+#
+
+# Simple marker to check that properties are correctly overridden
+packaging.type=deb

src/deb/control/control renamed to src/packaging/deb/control/control

@@ -0,0 +1,5 @@
+# Properties used to build to the RPM package
+#
+
+# Simple marker to check that properties are correctly overridden
+packaging.type=rpm