Updated Branches:
  refs/heads/master 39af29da4 -> 25463a414

BIGTOP-946. solr-server runlevels are wrong in debian


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e4e85d12
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e4e85d12
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e4e85d12

Branch: refs/heads/master
Commit: e4e85d125c20d686f565cf0b3b69b66fad51498b
Parents: 39af29d
Author: Sean Mackrory <[email protected]>
Authored: Mon Apr 29 09:57:48 2013 -0700
Committer: Roman Shaposhnik <[email protected]>
Committed: Wed May 1 15:56:43 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/solr/solr-server.init |  145 -----------------
 bigtop-packages/src/rpm/solr/solr-server.init    |  145 +++++++++++++++++
 2 files changed, 145 insertions(+), 145 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4e85d12/bigtop-packages/src/common/solr/solr-server.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/solr/solr-server.init 
b/bigtop-packages/src/common/solr/solr-server.init
deleted file mode 100644
index 6d1a035..0000000
--- a/bigtop-packages/src/common/solr/solr-server.init
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Starts a Solr server
-#
-# chkconfig: 345 90 10
-# description: Solr server
-#
-### BEGIN INIT INFO
-# Provides:          solr-server
-# Required-Start:    $remote_fs
-# Should-Start:
-# Required-Stop:     $remote_fs
-# Should-Stop:
-# Default-Start:     3 4 5
-# Default-Stop:      0 1 2 6
-# Short-Description: Solr server
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-STATUS_RUNNING=0
-STATUS_DEAD=1
-STATUS_DEAD_AND_LOCK=2
-STATUS_NOT_RUNNING=3
-
-ERROR_PROGRAM_NOT_INSTALLED=5
-
-SOLR_RUN_DIR=/var/run/solr
-SOLR_HOME=/usr/lib/solr
-SOLR_USER=solr
-
-SOLR_LOCK_DIR="/var/lock/subsys/"
-LOCKFILE="${SOLR_LOCK_DIR}/solr"
-desc="Solr server daemon"
-
-EXEC_PATH=$SOLR_HOME/bin/solrd
-SOLR_PID_FILE=${SOLR_RUN_DIR}/solr.pid
-
-# These directories may be tmpfs and may or may not exist
-# depending on the OS (ex: /var/lock/subsys does not exist on debian/ubuntu)
-for dir in "$SOLR_RUN_DIR" "$SOLR_LOCK_DIR"; do
-  [ -d "${dir}" ] || install -d -m 0755 -o $SOLR_USER -g $SOLR_USER ${dir}
-done
-
-SOLR_SHUTDOWN_TIMEOUT=${SOLR_SHUTDOWN_TIMEOUT:-60}
-
-start() {
-  [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
-
-  checkstatus
-  status=$?
-  if [ "$status" -eq "$STATUS_RUNNING" ]; then
-    exit 0
-  fi
-
-  log_success_msg "Starting $desc: "
-  /bin/su -s /bin/bash -c "${EXEC_PATH} start" $SOLR_USER
-  RETVAL=$?
-  [ $RETVAL -eq 0 ] && touch $LOCKFILE
-  return $RETVAL
-}
-
-stop() {
-  if [ ! -e $SOLR_PID_FILE ]; then
-    log_failure_msg "$desc is not running"
-    exit 0
-  fi
-
-  log_success_msg "Stopping ${desc}: "
-
-  /bin/su -s /bin/bash -c "${EXEC_PATH} stop $SOLR_SHUTDOWN_TIMEOUT -force" 
$SOLR_USER
-  rm -f $LOCKFILE $SOLR_PID_FILE
-  return 0
-}
-
-restart() {
-  stop
-  start
-}
-
-checkstatus(){
-  pidofproc -p $SOLR_PID_FILE java > /dev/null
-  status=$?
-
-  case "$status" in
-    $STATUS_RUNNING)
-      log_success_msg "$desc is running"
-      ;;
-    $STATUS_DEAD)
-      log_failure_msg "$desc is dead and pid file exists"
-      ;;
-    $STATUS_DEAD_AND_LOCK)
-      log_failure_msg "$desc is dead and lock file exists"
-      ;;
-    $STATUS_NOT_RUNNING)
-      log_failure_msg "$desc agent is not running"
-      ;;
-    *)
-      log_failure_msg "$desc agent status is unknown"
-      ;;
-  esac
-  return $status
-}
-
-condrestart(){
-  [ -e ${LOCKFILE} ] && restart || :
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  status)
-    checkstatus
-    ;;
-  restart)
-    restart
-    ;;
-  condrestart|try-restart)
-    condrestart
-    ;;
-  *)
-    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart}"
-    exit 1
-esac
-
-exit $RETVAL

http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4e85d12/bigtop-packages/src/rpm/solr/solr-server.init
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/solr/solr-server.init 
b/bigtop-packages/src/rpm/solr/solr-server.init
new file mode 100644
index 0000000..6d1a035
--- /dev/null
+++ b/bigtop-packages/src/rpm/solr/solr-server.init
@@ -0,0 +1,145 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Starts a Solr server
+#
+# chkconfig: 345 90 10
+# description: Solr server
+#
+### BEGIN INIT INFO
+# Provides:          solr-server
+# Required-Start:    $remote_fs
+# Should-Start:
+# Required-Stop:     $remote_fs
+# Should-Stop:
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
+# Short-Description: Solr server
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+STATUS_RUNNING=0
+STATUS_DEAD=1
+STATUS_DEAD_AND_LOCK=2
+STATUS_NOT_RUNNING=3
+
+ERROR_PROGRAM_NOT_INSTALLED=5
+
+SOLR_RUN_DIR=/var/run/solr
+SOLR_HOME=/usr/lib/solr
+SOLR_USER=solr
+
+SOLR_LOCK_DIR="/var/lock/subsys/"
+LOCKFILE="${SOLR_LOCK_DIR}/solr"
+desc="Solr server daemon"
+
+EXEC_PATH=$SOLR_HOME/bin/solrd
+SOLR_PID_FILE=${SOLR_RUN_DIR}/solr.pid
+
+# These directories may be tmpfs and may or may not exist
+# depending on the OS (ex: /var/lock/subsys does not exist on debian/ubuntu)
+for dir in "$SOLR_RUN_DIR" "$SOLR_LOCK_DIR"; do
+  [ -d "${dir}" ] || install -d -m 0755 -o $SOLR_USER -g $SOLR_USER ${dir}
+done
+
+SOLR_SHUTDOWN_TIMEOUT=${SOLR_SHUTDOWN_TIMEOUT:-60}
+
+start() {
+  [ -x $exec ] || exit $ERROR_PROGRAM_NOT_INSTALLED
+
+  checkstatus
+  status=$?
+  if [ "$status" -eq "$STATUS_RUNNING" ]; then
+    exit 0
+  fi
+
+  log_success_msg "Starting $desc: "
+  /bin/su -s /bin/bash -c "${EXEC_PATH} start" $SOLR_USER
+  RETVAL=$?
+  [ $RETVAL -eq 0 ] && touch $LOCKFILE
+  return $RETVAL
+}
+
+stop() {
+  if [ ! -e $SOLR_PID_FILE ]; then
+    log_failure_msg "$desc is not running"
+    exit 0
+  fi
+
+  log_success_msg "Stopping ${desc}: "
+
+  /bin/su -s /bin/bash -c "${EXEC_PATH} stop $SOLR_SHUTDOWN_TIMEOUT -force" 
$SOLR_USER
+  rm -f $LOCKFILE $SOLR_PID_FILE
+  return 0
+}
+
+restart() {
+  stop
+  start
+}
+
+checkstatus(){
+  pidofproc -p $SOLR_PID_FILE java > /dev/null
+  status=$?
+
+  case "$status" in
+    $STATUS_RUNNING)
+      log_success_msg "$desc is running"
+      ;;
+    $STATUS_DEAD)
+      log_failure_msg "$desc is dead and pid file exists"
+      ;;
+    $STATUS_DEAD_AND_LOCK)
+      log_failure_msg "$desc is dead and lock file exists"
+      ;;
+    $STATUS_NOT_RUNNING)
+      log_failure_msg "$desc agent is not running"
+      ;;
+    *)
+      log_failure_msg "$desc agent status is unknown"
+      ;;
+  esac
+  return $status
+}
+
+condrestart(){
+  [ -e ${LOCKFILE} ] && restart || :
+}
+
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  status)
+    checkstatus
+    ;;
+  restart)
+    restart
+    ;;
+  condrestart|try-restart)
+    condrestart
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|status|restart|try-restart|condrestart}"
+    exit 1
+esac
+
+exit $RETVAL

Reply via email to