summaryrefslogtreecommitdiff
path: root/textproc/elasticsearch7/files
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/elasticsearch7/files')
-rw-r--r--textproc/elasticsearch7/files/elasticsearch.in6
-rw-r--r--textproc/elasticsearch7/files/patch-bin_elasticsearch-env26
-rw-r--r--textproc/elasticsearch7/files/patch-config_elasticsearch.yml4
-rw-r--r--textproc/elasticsearch7/files/patch-config_jvm.options4
-rw-r--r--textproc/elasticsearch7/files/pkg-message.in6
5 files changed, 39 insertions, 7 deletions
diff --git a/textproc/elasticsearch7/files/elasticsearch.in b/textproc/elasticsearch7/files/elasticsearch.in
index 4a037b2a9918..002a2335bf0b 100644
--- a/textproc/elasticsearch7/files/elasticsearch.in
+++ b/textproc/elasticsearch7/files/elasticsearch.in
@@ -1,8 +1,8 @@
#!/bin/sh
# PROVIDE: elasticsearch
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
# KEYWORD: shutdown
#
# Add the following line to /etc/rc.conf to enable elasticsearch:
@@ -44,7 +44,7 @@ command=%%PREFIX%%/lib/elasticsearch/bin/elasticsearch
command_args="-d --pidfile=${pidfile}"
export ES_PATH_CONF=${elasticsearch_config}
-export JAVA_HOME=${elasticsearch_java_home}
+export ES_JAVA_HOME=${elasticsearch_java_home}
elasticsearch_precmd()
{
diff --git a/textproc/elasticsearch7/files/patch-bin_elasticsearch-env b/textproc/elasticsearch7/files/patch-bin_elasticsearch-env
new file mode 100644
index 000000000000..4dee506b5784
--- /dev/null
+++ b/textproc/elasticsearch7/files/patch-bin_elasticsearch-env
@@ -0,0 +1,26 @@
+--- bin/elasticsearch-env.orig 2021-07-05 19:40:21 UTC
++++ bin/elasticsearch-env
+@@ -46,12 +46,17 @@ elif [ ! -z "$JAVA_HOME" ]; then
+ JAVA_TYPE="JAVA_HOME"
+ else
+ # use the bundled JDK (default)
+- if [ "$(uname -s)" = "Darwin" ]; then
+- # macOS has a different structure
+- JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
+- else
+- JAVA="$ES_HOME/jdk/bin/java"
+- fi
++ case "$(uname -s)" in
++ "Darwin")
++ JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
++ ;;
++ "FreeBSD")
++ JAVA=%%LOCALBASE%%/bin/java
++ ;;
++ *)
++ JAVA="$ES_HOME/jdk/bin/java"
++ ;;
++ esac
+ JAVA_TYPE="bundled JDK"
+ fi
+
diff --git a/textproc/elasticsearch7/files/patch-config_elasticsearch.yml b/textproc/elasticsearch7/files/patch-config_elasticsearch.yml
index a39468ea84c9..ede1e3ded1bb 100644
--- a/textproc/elasticsearch7/files/patch-config_elasticsearch.yml
+++ b/textproc/elasticsearch7/files/patch-config_elasticsearch.yml
@@ -1,4 +1,4 @@
---- config/elasticsearch.yml.orig 2018-09-26 13:30:23 UTC
+--- config/elasticsearch.yml.orig 2021-06-10 20:59:11 UTC
+++ config/elasticsearch.yml
@@ -31,10 +31,12 @@
# Path to directory where to store the data (separate multiple locations by comma):
@@ -13,7 +13,7 @@
#
# ----------------------------------- Memory -----------------------------------
#
-@@ -86,3 +88,6 @@
+@@ -80,3 +82,6 @@
# Require explicit names when deleting indices:
#
#action.destructive_requires_name: true
diff --git a/textproc/elasticsearch7/files/patch-config_jvm.options b/textproc/elasticsearch7/files/patch-config_jvm.options
index 6289563798a9..7c8c3ce353c0 100644
--- a/textproc/elasticsearch7/files/patch-config_jvm.options
+++ b/textproc/elasticsearch7/files/patch-config_jvm.options
@@ -1,6 +1,6 @@
---- config/jvm.options.orig 2020-01-15 04:09:47 UTC
+--- config/jvm.options.orig 2021-06-10 20:59:11 UTC
+++ config/jvm.options
-@@ -67,10 +67,10 @@
+@@ -83,10 +83,10 @@
8:-XX:+PrintGCDateStamps
8:-XX:+PrintTenuringDistribution
8:-XX:+PrintGCApplicationStoppedTime
diff --git a/textproc/elasticsearch7/files/pkg-message.in b/textproc/elasticsearch7/files/pkg-message.in
index f664cda07807..2182e1a8789b 100644
--- a/textproc/elasticsearch7/files/pkg-message.in
+++ b/textproc/elasticsearch7/files/pkg-message.in
@@ -9,6 +9,12 @@ You may need to set:
sysctl security.bsd.unprivileged_mlock=1
+When running within a jail, it's highly advisable to set:
+
+enforce_statfs = 1
+
+for the jail running elasticsearch instance.
+
!!! PLUGINS NOTICE !!!
ElasticSearch plugins should only be installed via the elasticsearch-plugin