diff options
Diffstat (limited to 'databases/elasticsearch/patches')
5 files changed, 58 insertions, 59 deletions
diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch b/databases/elasticsearch/patches/patch-bin_elasticsearch new file mode 100644 index 00000000000..b694be39d75 --- /dev/null +++ b/databases/elasticsearch/patches/patch-bin_elasticsearch @@ -0,0 +1,21 @@ +$NetBSD: patch-bin_elasticsearch,v 1.1 2016/11/08 09:18:01 fhajny Exp $ + +Default paths. + +--- bin/elasticsearch.orig 2016-10-26 04:35:54.000000000 +0000 ++++ bin/elasticsearch +@@ -104,8 +104,13 @@ while [ -h "$SCRIPT" ] ; do + fi + done + ++#set default JAVA_HOME ++if [ -z "$JAVA_HOME" ]; then ++ JAVA_HOME="@PKG_JAVA_HOME@" ++fi ++ + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++ES_HOME="@ES_BASEDIR@" + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin b/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin new file mode 100644 index 00000000000..7c764b6de5d --- /dev/null +++ b/databases/elasticsearch/patches/patch-bin_elasticsearch-plugin @@ -0,0 +1,30 @@ +$NetBSD: patch-bin_elasticsearch-plugin,v 1.1 2016/11/08 09:18:01 fhajny Exp $ + +Default paths. + +--- bin/elasticsearch-plugin.orig 2016-10-26 04:35:54.000000000 +0000 ++++ bin/elasticsearch-plugin +@@ -15,8 +15,13 @@ while [ -h "$SCRIPT" ] ; do + fi + done + ++#set default JAVA_HOME ++if [ -z "$JAVA_HOME" ]; then ++ JAVA_HOME="@PKG_JAVA_HOME@" ++fi ++ + # determine elasticsearch home +-ES_HOME=`dirname "$SCRIPT"`/.. ++ES_HOME="@ES_BASEDIR@" + + # make ELASTICSEARCH_HOME absolute + ES_HOME=`cd "$ES_HOME"; pwd` +@@ -23,7 +29,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` + + # Sets the default values for elasticsearch variables used in this script + if [ -z "$CONF_DIR" ]; then +- CONF_DIR="$ES_HOME/config" ++ CONF_DIR="@PKG_SYSCONFDIR@" + fi + + # The default env file is defined at building/packaging time. diff --git a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh b/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh deleted file mode 100644 index a31efbff99e..00000000000 --- a/databases/elasticsearch/patches/patch-bin_elasticsearch.in.sh +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bin_elasticsearch.in.sh,v 1.7 2016/10/26 13:56:30 fhajny Exp $ - -Fix paths. - ---- bin/elasticsearch.in.sh.orig 2015-10-21 08:41:12.000000000 +0000 -+++ bin/elasticsearch.in.sh -@@ -10,7 +10,7 @@ EOF - exit 1 - fi - --ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.1.jar:$ES_HOME/lib/*" -+ES_CLASSPATH="@ES_LIBDIR@/elasticsearch-2.4.1.jar:@ES_LIBDIR@/*" - - if [ "x$ES_MIN_MEM" = "x" ]; then - ES_MIN_MEM=256m diff --git a/databases/elasticsearch/patches/patch-bin_plugin b/databases/elasticsearch/patches/patch-bin_plugin deleted file mode 100644 index 8e3bcd74560..00000000000 --- a/databases/elasticsearch/patches/patch-bin_plugin +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-bin_plugin,v 1.2 2015/11/12 15:37:08 fhajny Exp $ - -Fix paths and improve portability. - ---- bin/plugin.orig 2015-10-21 13:32:03.000000000 +0000 -+++ bin/plugin -@@ -16,8 +16,13 @@ while [ -h "$SCRIPT" ] ; do - fi - done - -+#set default JAVA_HOME -+if [ -z "$JAVA_HOME" ]; then -+ JAVA_HOME="@PKG_JAVA_HOME@" -+fi -+ - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+ES_HOME="@PREFIX@" - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -@@ -25,7 +30,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` - - # Sets the default values for elasticsearch variables used in this script - if [ -z "$CONF_DIR" ]; then -- CONF_DIR="$ES_HOME/config" -+ CONF_DIR="@PKG_SYSCONFDIR@" - fi - - # The default env file is defined at building/packaging time. -@@ -105,4 +110,4 @@ fi - HOSTNAME=`hostname | cut -d. -f1` - export HOSTNAME - --eval "$JAVA" -client -Delasticsearch -Des.path.home="\"$ES_HOME\"" $properties -cp "\"$ES_HOME/lib/*\"" org.elasticsearch.plugins.PluginManagerCliParser $args -+eval "$JAVA" -client -Delasticsearch -Des.path.home="\"$ES_HOME\"" $properties -cp "\"@ES_LIBDIR@/*\"" org.elasticsearch.plugins.PluginManagerCliParser $args diff --git a/databases/elasticsearch/patches/patch-config_elasticsearch.yml b/databases/elasticsearch/patches/patch-config_elasticsearch.yml index c77b86783f2..f9340a9a1bd 100644 --- a/databases/elasticsearch/patches/patch-config_elasticsearch.yml +++ b/databases/elasticsearch/patches/patch-config_elasticsearch.yml @@ -1,23 +1,22 @@ -$NetBSD: patch-config_elasticsearch.yml,v 1.4 2015/11/12 15:37:08 fhajny Exp $ +$NetBSD: patch-config_elasticsearch.yml,v 1.5 2016/11/08 09:18:01 fhajny Exp $ Define various paths ---- config/elasticsearch.yml.orig 2015-10-21 08:41:12.000000000 +0000 +--- config/elasticsearch.yml.orig 2016-10-26 04:35:54.000000000 +0000 +++ config/elasticsearch.yml -@@ -31,10 +31,16 @@ +@@ -31,10 +31,15 @@ # Path to directory where to store the data (separate multiple locations by comma): # - # path.data: /path/to/data + #path.data: /path/to/data +path.data: @ES_DBDIR@ # # Path to log files: # - # path.logs: /path/to/logs + #path.logs: /path/to/logs +path.logs: @ES_LOGDIR@ -+ ++# ++# Path to config files +path.conf: @PKG_SYSCONFDIR@ -+path.plugins: @ES_LIBDIR@/plugins -+path.work: @ES_TMPDIR@ # # ----------------------------------- Memory ----------------------------------- # |