| 1 |
commit: f709630fc7ee38948f67288fad113feae2ff75ba |
| 2 |
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 12:52:18 2018 +0000 |
| 4 |
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 12:52:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f709630f |
| 7 |
|
| 8 |
app-misc/elasticsearch: Most recent SugarCRM Enterprise supported release. Remove faulty release. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
app-misc/elasticsearch/Manifest | 2 +- |
| 13 |
...rch-1.7.5.ebuild => elasticsearch-1.7.6.ebuild} | 2 +- |
| 14 |
app-misc/elasticsearch/files/elasticsearch.init.1 | 64 ++++++++++++++++++++++ |
| 15 |
3 files changed, 66 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest |
| 18 |
index 9ddccc402db..15417d6ba11 100644 |
| 19 |
--- a/app-misc/elasticsearch/Manifest |
| 20 |
+++ b/app-misc/elasticsearch/Manifest |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-DIST elasticsearch-1.7.5.tar.gz 28487351 BLAKE2B 96c18bf85378eecb330ed493794a448c0d3285d1c36d1add31d7840974d1a20516b0c008ce749249de105f6f6bd93b95bfd7f97ab02d4bb5d61ebf58060646ae SHA512 372e9edf5bd9f68c476e15276fc90cf2ecddbafde17fe803e6a50261c2d3a80616a9440d86494d8cfa411703f87cf053d31c62f4cdee260d64cdc0c07b5741ba |
| 23 |
+DIST elasticsearch-1.7.6.tar.gz 28488767 BLAKE2B 0dc4fb10355e2139ee3a7e7e65366e8aa533b9714bf0f00d2bd8f4ef0669ba9f8f10dc5255c8c7a62abc0362e08ab5fda3c8b6b6f2bacfe5cce7255973293162 SHA512 2746f09b66919912e785c8d25c50ae74dbb38a41d99d9c926550786f9c2d7953d1ae1a54a32dae59a7269e5fbfa74dfbc91c3d412e415efd01c391ef7d329ba7 |
| 24 |
DIST elasticsearch-5.5.3.tar.gz 33486646 BLAKE2B 4f28d843b2daa73af1160436f9eedd20b9d91ee8d4454a210ad59c736c0ac0bd91384d972583d4de7e7dbc228b3e37546343da68545312333379298042ad8214 SHA512 013e238a3ccdb795b9472a6111ae804b770435776dfb703b379c34498591d3804e45fb27a7c473348917b4d9e6fde367184474680f1f72bbca129bf9644fb527 |
| 25 |
DIST elasticsearch-5.6.5.tar.gz 33780822 BLAKE2B 0541e27d7d9d18ec308495ab1cfb65c8f8e79960ef5d110ef5194a4033301b858a676c8c4d61f246e01ebc5679280c3eafe628e22ccfd84de9129f7a4606a041 SHA512 c3f31f561631c3f8df53cb49ac9a86dff3bcaa9e3ea2ac67dd959900ec1ddf676d307c9d8319ac51062072e506994934c61395049f6a6eac67e377d53517103f |
| 26 |
DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee |
| 27 |
|
| 28 |
diff --git a/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild b/app-misc/elasticsearch/elasticsearch-1.7.6.ebuild |
| 29 |
similarity index 96% |
| 30 |
rename from app-misc/elasticsearch/elasticsearch-1.7.5.ebuild |
| 31 |
rename to app-misc/elasticsearch/elasticsearch-1.7.6.ebuild |
| 32 |
index 8813d90d9d7..eca489c9bd2 100644 |
| 33 |
--- a/app-misc/elasticsearch/elasticsearch-1.7.5.ebuild |
| 34 |
+++ b/app-misc/elasticsearch/elasticsearch-1.7.6.ebuild |
| 35 |
@@ -52,7 +52,7 @@ src_install() { |
| 36 |
|
| 37 |
keepdir /var/{lib,log}/${MY_PN} |
| 38 |
|
| 39 |
- newinitd "${FILESDIR}/elasticsearch.init.3" "${MY_PN}" |
| 40 |
+ newinitd "${FILESDIR}/elasticsearch.init.1" "${MY_PN}" |
| 41 |
newconfd "${FILESDIR}/${MY_PN}.conf.3" "${MY_PN}" |
| 42 |
systemd_newunit "${FILESDIR}"/${PN}.service.2 "${PN}.service" |
| 43 |
} |
| 44 |
|
| 45 |
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.1 b/app-misc/elasticsearch/files/elasticsearch.init.1 |
| 46 |
new file mode 100644 |
| 47 |
index 00000000000..c44671c95d1 |
| 48 |
--- /dev/null |
| 49 |
+++ b/app-misc/elasticsearch/files/elasticsearch.init.1 |
| 50 |
@@ -0,0 +1,64 @@ |
| 51 |
+#!/sbin/openrc-run |
| 52 |
+ |
| 53 |
+name="Elasticsearch" |
| 54 |
+description="Elasticsearch Server" |
| 55 |
+ |
| 56 |
+ES_INSTANCE=${SVCNAME#*.} |
| 57 |
+ |
| 58 |
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then |
| 59 |
+ ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}" |
| 60 |
+ CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}" |
| 61 |
+ LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}" |
| 62 |
+else |
| 63 |
+ ES_BASE_PATH="/var/lib/elasticsearch/_default" |
| 64 |
+ CONF_DIR="/etc/elasticsearch" |
| 65 |
+ LOG_DIR="/var/log/elasticsearch/_default" |
| 66 |
+fi |
| 67 |
+ |
| 68 |
+ES_DATA_PATH="${ES_BASE_PATH}/data" |
| 69 |
+ES_WORK_PATH="${ES_BASE_PATH}/work" |
| 70 |
+ |
| 71 |
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"} |
| 72 |
+ES_USER=${ES_USER:="elasticsearch"} |
| 73 |
+ES_GROUP=${ES_GROUP:="elasticsearch"} |
| 74 |
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5} |
| 75 |
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536} |
| 76 |
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144} |
| 77 |
+ |
| 78 |
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"} |
| 79 |
+ |
| 80 |
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then |
| 81 |
+ ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh" |
| 82 |
+fi |
| 83 |
+ |
| 84 |
+export ES_INCLUDE |
| 85 |
+export JAVA_HOME |
| 86 |
+export JAVA_OPTS |
| 87 |
+export ES_JVM_OPTIONS |
| 88 |
+export ES_JAVA_OPTS |
| 89 |
+export ES_STARTUP_SLEEP_TIME |
| 90 |
+export ES_PATH_CONF="${CONF_DIR}" |
| 91 |
+ |
| 92 |
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid" |
| 93 |
+ |
| 94 |
+command="/usr/share/elasticsearch/bin/elasticsearch" |
| 95 |
+command_args="-d --pidfile=${pidfile} -Des.default.path.conf=\"${CONF_DIR}\" -Des.default.path.data=\"${ES_DATA_PATH}\" -Des.default.path.work=\"${ES_WORK_PATH}\" -Des.default.path.logs=\"${LOG_DIR}\"" |
| 96 |
+command_user="${ES_USER}:${ES_GROUP}" |
| 97 |
+required_files="${CONF_DIR}/elasticsearch.yml" |
| 98 |
+retry="TERM/30/KILL/30" |
| 99 |
+ |
| 100 |
+depend() { |
| 101 |
+ use net |
| 102 |
+} |
| 103 |
+ |
| 104 |
+start_pre() { |
| 105 |
+ if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then |
| 106 |
+ sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT} |
| 107 |
+ fi |
| 108 |
+ |
| 109 |
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch" |
| 110 |
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch" |
| 111 |
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch" |
| 112 |
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}" |
| 113 |
+ checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}" |
| 114 |
+} |
Archives