solr PID-handling

www-apps/solr/files/solr.conf.d

@@ -1,3 +1,7 @@
 SOLR_INCLUDE=/var/lib/solr/solr.in.sh
 
+SOLR_TMPDIR=/var/tmp/solr
+
+SOLR_PORT=8983
+
 SOLR_OPTS=""

www-apps/solr/files/solr.init.d

@@ -4,9 +4,12 @@
 # $Header: $
 
 start_stop_daemon_args="-u solr:solr"
+pidfile="/run/solr/solr-${SOLR_PORT:-8983}.pid"
 
 command="/bin/solr"
-command_args="start ${SOLR_OPTS}"
+command_args="start -p ${SOLR_PORT:-8983} ${SOLR_OPTS}"
+
+extra_commands="status"
 
 depend() {
 	need net
@@ -14,7 +17,15 @@ depend() {
 }
 
 start_pre() {
-	rm -rf /var/tmp/solr
-	mkdir /var/tmp/solr
-	chown solr:solr /var/tmp/solr
+	rm -rf ${SOLR_TMPDIR}
+	mkdir ${SOLR_TMPDIR}
+	chown solr:solr ${SOLR_TMPDIR}
+}
+
+status() {
+        /bin/solr status
+}
+
+stop() {
+	/bin/solr stop
 }