From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D49AD1384B4 for ; Thu, 17 Dec 2015 13:59:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA6C921C013; Thu, 17 Dec 2015 13:59:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A0BBE088B for ; Thu, 17 Dec 2015 13:59:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12D5334045C for ; Thu, 17 Dec 2015 13:59:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0F22C7A for ; Thu, 17 Dec 2015 13:59:12 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1450360738.1a0ea0914d676d18ddc19c8f7b48cd6c22f68cf9.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/elasticsearch/files/elasticsearch.init4 app-misc/elasticsearch/files/elasticsearch.init5 X-VCS-Directories: app-misc/elasticsearch/files/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 1a0ea0914d676d18ddc19c8f7b48cd6c22f68cf9 X-VCS-Branch: master Date: Thu, 17 Dec 2015 13:59:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f7ee7f97-23ce-49e8-8186-10519d252473 X-Archives-Hash: 6460ac7758e59a3e2bbf02c82f601ef4 commit: 1a0ea0914d676d18ddc19c8f7b48cd6c22f68cf9 Author: Ian Delaney gentoo org> AuthorDate: Thu Dec 17 13:56:10 2015 +0000 Commit: Ian Delaney gentoo org> CommitDate: Thu Dec 17 13:58:58 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ea091 app-misc/elasticsearch: switch to correct file elasticsearch.init5 file mistakenly mixed with ".service5", now obsoleted in the gentoo bug Gentoo bug: 564604 Package-Manager: portage-2.2.24 app-misc/elasticsearch/files/elasticsearch.init4 | 2 +- app-misc/elasticsearch/files/elasticsearch.init5 | 94 +++++++++++++++++++++--- 2 files changed, 86 insertions(+), 10 deletions(-) diff --git a/app-misc/elasticsearch/files/elasticsearch.init4 b/app-misc/elasticsearch/files/elasticsearch.init4 index 7110e58..4ba42f6 100644 --- a/app-misc/elasticsearch/files/elasticsearch.init4 +++ b/app-misc/elasticsearch/files/elasticsearch.init4 @@ -67,7 +67,7 @@ start() { checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")" checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}" checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}" - + start-stop-daemon --start \ --background \ --chdir "${ES_BASE_PATH}" \ diff --git a/app-misc/elasticsearch/files/elasticsearch.init5 b/app-misc/elasticsearch/files/elasticsearch.init5 index 739c6f8..a7fb185 100644 --- a/app-misc/elasticsearch/files/elasticsearch.init5 +++ b/app-misc/elasticsearch/files/elasticsearch.init5 @@ -1,11 +1,87 @@ -[Unit] -Description=Elasticsearch -After=network.target +#!/sbin/runscript -[Service] -User=elasticsearch -Environment=ES_INCLUDE=/usr/share/elasticsearch/bin/elasticsearch.in.sh -ExecStart=/usr/share/elasticsearch/bin/elasticsearch -Des.default.path.conf=/etc/elasticsearch +name="Elasticsearch" +description="" -[Install] -WantedBy=multi-user.target +ES_USER=${ES_USER:="elasticsearch"} +ES_INSTANCE=${SVCNAME#*.} + +if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then + PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid" + ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}" + ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}" + ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}" +else + PIDFILE="/run/elasticsearch/elasticsearch.pid" + ES_BASE_PATH="/var/lib/elasticsearch/_default" + ES_CONF_PATH="/etc/elasticsearch" + ES_LOG_PATH="/var/log/elasticsearch/_default" +fi + +ES_DATA_PATH="${ES_BASE_PATH}/data" +ES_WORK_PATH="${ES_BASE_PATH}/work" + +export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh" +export JAVA_OPTS +export ES_JAVA_OPTS +export ES_HEAP_SIZE +export ES_HEAP_NEWSIZE +export ES_DIRECT_SIZE +export ES_USE_IPV4 + +server_command="/usr/share/elasticsearch/bin/elasticsearch" +server_args=" -p ${PIDFILE} -Des.default.path.conf=${ES_CONF_PATH} -Des.default.path.data=${ES_DATA_PATH} -Des.default.path.work=${ES_WORK_PATH} -Des.default.path.logs=${ES_LOG_PATH}" + +depend() { + use net +} + +start() { + # elasticsearch -Des.config=/path/to/config/file + # elasticsearch -Des.network.host=10.0.0.4 + + [ ! -f "${ES_INCLUDE}" ] && { + eerror "${ES_INCLUDE} must be copied into place" + return 1 + } + + local conf + local conf_file + for conf in elasticsearch.yml logging.yml; do + conf_file="${ES_CONF_PATH}/${conf}" + if [ ! -f "${conf_file}" ]; then + eerror "${conf_file} must be copied into place" + return 1 + fi + done + + ebegin "Starting ${SVCNAME}" + + if [ -n "${ES_MAX_FD}" ]; then + ulimit -n ${ES_MAX_FD} + einfo "Max open filedescriptors : ${ES_MAX_FD}" + fi + + checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch" + checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch" + checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")" + checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}" + checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}" + + start-stop-daemon --start \ + --background \ + --chdir "${ES_BASE_PATH}" \ + --user="${ES_USER}" \ + --pidfile="${PIDFILE}" \ + --exec ${server_command} -- ${server_args} + eend $? +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop \ + --pidfile=${PIDFILE} \ + --user="${ES_USER}" \ + --retry=TERM/20/KILL/5 + eend $? +}