commit: 3f06f853e78a5f8c10c29c6e9508753ace0f7dd8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 21:24:16 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 21:24:16 2015 +0000
URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=3f06f853
dev-db/apache-solr-bin: added init script
Package-Manager: portage-2.2.23
dev-db/apache-solr-bin/Manifest | 5 +-
.../apache-solr-bin/apache-solr-bin-5.3.1.ebuild | 12 ++--
dev-db/apache-solr-bin/files/initd | 58 ++++++++++++++++++
dev-db/apache-solr-bin/files/solr.confd | 48 +++++++++++++++
dev-db/apache-solr-bin/files/solr.initd | 68 ++++++++++++++++++++++
5 files changed, 186 insertions(+), 5 deletions(-)
diff --git a/dev-db/apache-solr-bin/Manifest b/dev-db/apache-solr-bin/Manifest
index 8b36be4..0849b42 100644
--- a/dev-db/apache-solr-bin/Manifest
+++ b/dev-db/apache-solr-bin/Manifest
@@ -1,3 +1,6 @@
+AUX initd 1161 SHA256
78f08bb2490ef7263926db4c88148473bb21d73cc35a3b8954f63fe811ef1934 SHA512
43d48296a33f195ef448e7406232e5d94972452d692de2c5abf66bc19f0cdbe3520e6035bd2542f62ead56406e4b9e66e44b779113818bac70828f0e882a0cae
WHIRLPOOL
4ffd774a355dc3a280f08499640bf827b0a0d9b69638eba42ec4d1a2a9ba23e6aef384baad1d341d0c3345d5b0bacef26e763d69a88e8762dd4505f491b38895
+AUX solr.confd 759 SHA256
1c489c08b3d98b76cf702eb665301f34b16ed212e94e365d4b02e4a5cacbe425 SHA512
c645a15063fda1c59e8069f6156c00751be419833c0bb93c320e1a776d42b63d9a25c2d4e399a59b5ef3ccba0d28845f7fa1251ac5adfff3866b54150bdfe0b1
WHIRLPOOL
06b85bbf0c9418725c4d57d1cb36a807f4f213b249c0395852f0c8374fcab93a778bb8bc5291ff93272a42b163fd0362469d795c4e8960310d19871822b16938
+AUX solr.initd 1581 SHA256
bf74eb5460e4be217364680170623ad0682413942f840fac0a86455a7d067e3b SHA512
1bf34345b0524d1a97cb615f01f9045268f09db92c56cb3015a9b6d9b6f119d207559cb60be0b10dfa88397213d6e9f8c3e02e99f68acea9ef6333c822dfb907
WHIRLPOOL
7a8d7f6f56112e1c37ecb80af1aacc0d66a95d590022aabcfd22bf0d269b04fbd813a0d572696e592e64c122c92e3564850ded6de1e4f3d20a707d5e6683d221
DIST solr-5.3.1.tgz 134911094 SHA256
34ddcac071226acd6974a392af7671f687990aa1f9eb4b181d533ca6dca6f42d SHA512
e166698d2556abf9633c10bfc44739bc7faf29866e587406c97e9d4a3091b1a5f1ef485fa1c760865c21487255bc0b4219dbf7583ac2751f92a57fe46914bffb
WHIRLPOOL
1ce518b399fe55308c1c4b30c00d29e9f3bf3a0ab8555c247fb77e9f174bd19f46265a326ccf358007365f8713a70cfd4dd26ab17e5e352dc2982d8dac3d1791
-EBUILD apache-solr-bin-5.3.1.ebuild 13784 SHA256
e210a0f96c870271b0c82b649301f01e9a578cb2a95dacd800bf27d16afd607f SHA512
397162b2175b53d46f23598b896e73ea123f3c28bf35ab5ba93a38872c739b887188532d030773af81a823fd1636378ff4b3305b0d5d1675d2db523ee6b5d84b
WHIRLPOOL
23698951c1e8a25e0dc5ac137b8972187badaafffe47b166272b49575794387fafaac335463a1d7c371572938cec3d3b11ba0af490d892543d8b18b7638e050d
+EBUILD apache-solr-bin-5.3.1.ebuild 14005 SHA256
b5ec4457b7b246d0863dd4a8a73e5e4c4a775a37ee77b03c28c388ab82599e43 SHA512
234dfa3c22c1a7e80bc6a57fa48397e8f437bb3b1395c7ee94b6d76ef1b9037393769492034ce46492cc51f8c16e2d5dc77e18893e1a34033ab3bc94e33f433f
WHIRLPOOL
20f8c9e3ca467ca613d10caba391a0e91b03e443f3f2592d0a76ff7f850c31960db0ceb1c10503883004339787023d8433c287aaac162992b2a08816577e07f9
MISC metadata.xml 338 SHA256
079de59791ab66e210bff2a81bc6145dd0a9de153936023a6c67a27bc8e3a455 SHA512
d2d381bc26c6d2d5e3abfce795631b79e6b4233686ea041dee0e61c87663367b0f0cd148a883a854e61be1f77c363e1c8bb46b34588e88828b18f68dc0ce2367
WHIRLPOOL
f4076d287727d0a6ac640d2ed0fda6b762360be6b75a16e1360b6cd5553ed6fe94102e64b3940e93e94426538f582118e6c89feaf2c7f2e23d610ade478d1e97
diff --git a/dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild
b/dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild
index c8b3b77..cbf828c 100644
--- a/dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild
+++ b/dev-db/apache-solr-bin/apache-solr-bin-5.3.1.ebuild
@@ -36,7 +36,6 @@ RDEPEND=">=virtual/jre-1.7
dev-java/jackson:2
dev-java/joda-time:0
dev-java/junit:4
- dev-java/log4j:0
dev-java/lucene-core:5
dev-java/slf4j-api:0
dev-java/slf4j-log4j12:0
@@ -74,6 +73,11 @@ pkg_setup() {
}
src_install() {
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ newinitd "${FILESDIR}/solr.initd" ${MY_PN}-bin
+ newconfd "${FILESDIR}/solr.confd" ${MY_PN}-bin
+ sed -i "s/solrrocks/${randpw}/g" "${D}/etc/init.d/${MY_PN}-bin"
"${D}/etc/conf.d/${MY_PN}-bin"
+
# remove files that are not needed on linux
find \( -name "*.bat" -o -name "*.cmd" \) -delete
@@ -108,7 +112,7 @@ src_install() {
# /opt/solr/server
insinto /opt/${MY_PN}/server
- doins -r server/{README.txt,lib,modules,scripts,solr-webapp}
+ doins -r server/{README.txt,start.jar,lib,modules,scripts,solr-webapp}
dosym /etc/${MY_PN}/server /opt/${MY_PN}/server/etc
dosym /etc/${MY_PN}/contexts /opt/${MY_PN}/server/contexts
dosym /etc/${MY_PN}/resources /opt/${MY_PN}/server/resources
@@ -116,7 +120,7 @@ src_install() {
# /var/lib/solr
insinto /var/lib/${MY_PN}
- doins -r server/solr
+ doins -r server/solr/*
fperms 750 /var/lib/${MY_PN}
fowners solr:solr /var/lib/${MY_PN}
@@ -146,7 +150,7 @@ src_install() {
local instdir="${D}/opt/${MY_PN}/server/lib/ext"
# jcl-over-slf4j-1.7.7.jar
# jul-to-slf4j-1.7.7.jar
- rm "${instdir}/log4j-1.2.17.jar" && java-pkg_jar-from --into
"${instdir}" log4j || die "failed to unbundle jar"
+ # log4j-1.2.17.jar - our library does not contain
org/apache/log4j/pattern/BridgePatternParser
rm "${instdir}/slf4j-api-1.7.7.jar" && java-pkg_jar-from --into
"${instdir}" slf4j-api || die "failed to unbundle jar"
rm "${instdir}/slf4j-log4j12-1.7.7.jar" && java-pkg_jar-from --into
"${instdir}" slf4j-log4j12 || die "failed to unbundle jar"
diff --git a/dev-db/apache-solr-bin/files/initd
b/dev-db/apache-solr-bin/files/initd
new file mode 100644
index 0000000..78749ab
--- /dev/null
+++ b/dev-db/apache-solr-bin/files/initd
@@ -0,0 +1,58 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${SOLR_INCLUDE:=/opt/solr/bin/solr.in.sh}
+: ${SOLR_PID_DIR:=/var/run}
+: ${SOLR_JAVA_HOME:=$(java-config ${SOLR_JVM:+--select-vm ${SOLR_JVM}}
--jre-home)}
+: ${SOLR_SERVER_DIR:=/opt/solr/server}
+: ${SOLR_HOME_DIR:=/var/lib/solr}
+: ${SOLR_PORT:=8983}
+: ${SOLR_STOP_KEY:=solrrocks}
+
+SOLR_PID=${SOLR_PID_DIR}/solr-${SOLR_PORT}.pid
+SCRIPT=/usr/bin/solr
+
+depend() {
+ use dns logger net
+}
+
+start() {
+ ebegin "Starting ${RC_SVCNAME}"
+
+ local javaopts=""
+
+ if [ -n "${JAVA_OPTS}" ] ; then
+ javaopts="-a \"${JAVA_OPTS}\""
+ fi
+
+ start-stop-daemon --start \
+ --quiet --background \
+ --chdir ${SOLR_HOME} \
+ --user ${SOLR_USER}:${SOLR_GROUP} \
+ --pidfile ${SOLR_PID} \
+ --exec ${SCRIPT} \
+ -- \
+ start \
+ -d ${SOLR_SERVER_DIR} \
+ -s ${SOLR_HOME_DIR} \
+ -p ${SOLR_PORT} \
+ ${SOLR_EXTRA_ARGS} ${javaopts}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME}"
+
+ start-stop-daemon --stop \
+ --quiet --retry=60 \
+ --pidfile ${SOLR_PID} \
+ --exec ${SCRIPT} \
+ -- \
+ stop \
+ -p ${SOLR_PORT} \
+ -k ${SOLR_STOP_KEY}
+
+ eend $?
+}
diff --git a/dev-db/apache-solr-bin/files/solr.confd
b/dev-db/apache-solr-bin/files/solr.confd
new file mode 100644
index 0000000..787d5e3
--- /dev/null
+++ b/dev-db/apache-solr-bin/files/solr.confd
@@ -0,0 +1,48 @@
+#
+# For more configuration options see /etc/init.d/solr-bin.
+#
+
+# Set the handle of the JVM to use. If unset uses the system-vm.
+# run 'eselect java-vm list' to get possible values.
+#
+#SOLR_JVM="icedtea-7"
+
+# Additional options to pass to the JVM.
+#
+JAVA_OPTS="-server -Xss256k -Xms512m -Xmx512m -XX:CMSFullGCsBeforeCompaction=1
-XX:CMSTriggerPermRatio=80"
+
+# User/group of this instance
+SOLR_USER=solr
+SOLR_GROUP=solr
+
+# SOLR home directory.
+#
+#SOLR_HOME_DIR=/var/lib/solr
+
+# SOLR host.
+#
+#SOLR_HOST=localhost
+
+# SOLR port.
+#
+#SOLR_PORT=8983
+
+# SOLR stop port.
+#
+#SOLR_STOP_PORT=7983
+
+# SOLR time zone.
+#
+#SOLR_TIMEZONE=UTC
+
+# SOLR stop key.
+#
+#SOLR_STOP_KEY=solrrocks
+
+# SOLR log directory.
+#
+#SOLR_LOG_DIR=/var/log/solr
+
+# SOLR module.
+#
+#SOLR_MODULE=http
diff --git a/dev-db/apache-solr-bin/files/solr.initd
b/dev-db/apache-solr-bin/files/solr.initd
new file mode 100644
index 0000000..81ac489
--- /dev/null
+++ b/dev-db/apache-solr-bin/files/solr.initd
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${JAVA_HOME:=$(java-config ${SOLR_JVM:+--select-vm ${SOLR_JVM}} --jre-home)}
+: ${SOLR_HOME_DIR:=/var/lib/solr}
+: ${SOLR_HOST:=localhost}
+: ${SOLR_PORT:=8983}
+: ${SOLR_STOP_PORT:=7983}
+: ${SOLR_STOP_KEY:=solrrocks}
+: ${SOLR_TIMEZONE:=UTC}
+: ${SOLR_LOG_DIR:=/var/log/solr}
+: ${SOLR_MODULE:=http}
+
+PIDDIR=/var/run/solr
+PIDFILE=${PIDDIR}/solr-${SOLR_PORT}.pid
+JAVA=${JAVA_HOME}/bin/java
+SOLR_TIP=/opt/solr
+SOLR_SERVER_DIR=/opt/solr/server
+
+depend() {
+ use dns logger net
+}
+
+start() {
+ ebegin "Starting ${RC_SVCNAME}"
+
+ mkdir -p ${PIDDIR}
+ chown ${SOLR_USER}:${SOLR_GROUP} ${PIDDIR}
+
+ start-stop-daemon --start \
+ --quiet --background \
+ --chdir ${SOLR_SERVER_DIR} \
+ --user ${SOLR_USER}:${SOLR_GROUP} \
+ --make-pid --pidfile ${PIDFILE} \
+ --exec ${JAVA} \
+ -- \
+ ${JAVA_OPTS} \
+ -Djetty.port=${SOLR_PORT} \
+ -DSTOP.PORT=${SOLR_STOP_PORT} \
+ -DSTOP.KEY=${SOLR_STOP_KEY} \
+ -Duser.timezone=${SOLR_TIMEZONE} \
+ -Djetty.home=${SOLR_SERVER_DIR} \
+ -Dsolr.solr.home=${SOLR_HOME_DIR} \
+ -Dsolr.install.dir=${SOLR_TIP} \
+ -jar start.jar \
+ "-XX:OnOutOfMemoryError=/opt/solr/bin/oom_solr.sh
${SOLR_PORT} ${SOLR_LOG_DIR}" \
+ --module=${SOLR_MODULE}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${RC_SVCNAME}"
+
+ start-stop-daemon --stop \
+ --quiet \
+ --pidfile ${PIDFILE} \
+ --exec ${JAVA} \
+ -- \
+ ${JAVA_OPTS} \
+ -jar ${SOLR_SERVER_DIR}/start.jar \
+ STOP.PORT=${SOLR_STOP_PORT} \
+ STOP.KEY=${SOLR_STOP_KEY} \
+ --stop
+
+ eend $?
+}
