update server scripts for 0.8 changes, new indexer/search, fixes CHEF-951

8 files changed, 260 insertions, 5 deletions

diff --git a/chef/distro/redhat/etc/init.d/chef-server b/chef/distro/redhat/etc/init.d/chef-server
index c0aeb4d261..9729239e4b 100644
--- a/chef/distro/redhat/etc/init.d/chef-server
+++ b/chef/distro/redhat/etc/init.d/chef-server
@@ -20,13 +20,13 @@ lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/server.rb}
 user=${USER-chef}
 group=${GROUP-chef}
-cluster_nodes=${CLUSTER_NODES-2}
+cluster_nodes=${CLUSTER_NODES-1}
 logfile=${LOGFILE-/var/log/chef/merb.%s.log}
 options=${OPTIONS-}
 
 start() {
     echo -n "Starting $prog:"
-    daemon chef-server -d -c "$cluster_nodes" -C "$config" -u "$user" -G "$group" -L "$logfile" -P "$childpidfiles" "$options" "&>/dev/null"
+    daemon $prog -d -c "$cluster_nodes" -C "$config" -u "$user" -G "$group" -L "$logfile" -P "$childpidfiles" "$options" "&>/dev/null"
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch ${lockfile}
@@ -36,7 +36,7 @@ start() {
 stop() {
     echo -n "Stopping $prog: "
     if [ -f $pidfile ]; then
-        killproc chef-server
+        killproc $prog
         RETVAL=$?
         if [ $RETVAL -ne 0 ]; then
             failure;
@@ -68,7 +68,7 @@ case "$1" in
         fi
         ;;
   status)
-        status chef-server
+        status $prog
         ;;
   *)
     echo "Usage: $0 {start|stop|restart|condrestart|status}"
diff --git a/chef/distro/redhat/etc/init.d/chef-server-webui b/chef/distro/redhat/etc/init.d/chef-server-webui
new file mode 100644
index 0000000000..3b0b0d0ea6
--- /dev/null
+++ b/chef/distro/redhat/etc/init.d/chef-server-webui
@@ -0,0 +1,78 @@
+#!/bin/bash
+# Startup script for chef-server-webui
+#
+# chkconfig: - 66 34
+# description: Server component of the Chef systems integration framework.
+# processname: chef-server-webui
+#
+# config: /etc/sysconfig/chef-server-webui
+# pidfile: /var/run/chef/chef-server-webui.pid
+
+# Source function library
+. /etc/init.d/functions
+
+[ -f /etc/sysconfig/chef-server-webui ] && . /etc/sysconfig/chef-server-webui
+
+prog="chef-server-webui"
+childpidfiles=${CHILDPIDFILES-/var/run/chef/server-webui.%s.pid}
+pidfile=${PIDFILE-/var/run/chef/server-webui.main.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/$prog}
+config=${CONFIG-/etc/chef/server.rb}
+user=${USER-chef}
+group=${GROUP-chef}
+cluster_nodes=${CLUSTER_NODES-1}
+logfile=${LOGFILE-/var/log/chef/merb-webui.%s.log}
+options=${OPTIONS-}
+
+start() {
+    echo -n "Starting $prog:"
+    daemon $prog -d -c "$cluster_nodes" -C "$config" -u "$user" -G "$group" -L "$logfile" -P "$childpidfiles" "$options" "&>/dev/null"
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch ${lockfile}
+    return $RETVAL
+}
+
+stop() {
+    echo -n "Stopping $prog: "
+    if [ -f $pidfile ]; then
+        killproc $prog
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+            failure;
+        fi;
+    else
+        RETVAL=1
+        failure;
+    fi
+    rm -f $lockfile
+    echo
+    return $RETVAL
+}
+
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  restart)
+        stop
+        start
+        ;;
+  condrestart)
+        if [ -f $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+  status)
+        status $prog
+        ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
+esac
+
+exit $RETVAL
diff --git a/chef/distro/redhat/etc/init.d/chef-solr b/chef/distro/redhat/etc/init.d/chef-solr
new file mode 100644
index 0000000000..6402ffb358
--- /dev/null
+++ b/chef/distro/redhat/etc/init.d/chef-solr
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Startup script for chef-solr
+#
+# chkconfig: - 66 34
+# description: SOLR search engine for Chef Server.
+# processname: chef-solr
+#
+# config: /etc/sysconfig/chef-solr
+# pidfile: /var/run/chef/chef-solr.pid
+
+# Source function library
+. /etc/init.d/functions
+
+[ -f /etc/sysconfig/chef-solr ] && . /etc/sysconfig/chef-solr
+
+prog="chef-solr"
+pidfile=${PIDFILE-/var/run/chef/solr.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/$prog}
+config=${CONFIG-/etc/chef/server.rb}
+user=${USER-chef}
+group=${GROUP-chef}
+logfile=${LOGFILE-/var/log/chef/solr.log}
+options=${OPTIONS-}
+
+start() {
+    echo -n "Starting $prog:"
+    daemon $prog -d -c "$config" -u "$user" -g "$group" -L "$logfile" -j "$options" "&>/dev/null"
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch ${lockfile}
+    return $RETVAL
+}
+
+stop() {
+    echo -n "Stopping $prog: "
+    if [ -f $pidfile ]; then
+        killproc $prog
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+            failure;
+        fi;
+    else
+        RETVAL=1
+        failure;
+    fi
+    rm -f $lockfile
+    echo
+    return $RETVAL
+}
+
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  restart)
+        stop
+        start
+        ;;
+  condrestart)
+        if [ -f $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+  status)
+        status $prog
+        ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
+esac
+
+exit $RETVAL
diff --git a/chef/distro/redhat/etc/init.d/chef-solr-indexer b/chef/distro/redhat/etc/init.d/chef-solr-indexer
new file mode 100644
index 0000000000..612c126950
--- /dev/null
+++ b/chef/distro/redhat/etc/init.d/chef-solr-indexer
@@ -0,0 +1,75 @@
+#!/bin/bash
+# Startup script for chef-solr-indexer
+#
+# chkconfig: - 66 34
+# description: Search indexer component of Chef Server.
+# processname: chef-solr-indexer
+#
+# config: /etc/sysconfig/chef-solr-indexer
+# pidfile: /var/run/chef/chef-solr-indexer.pid
+
+# Source function library
+. /etc/init.d/functions
+
+[ -f /etc/sysconfig/chef-solr-indexer ] && . /etc/sysconfig/chef-solr-indexer
+
+prog="chef-solr-indexer"
+pidfile=${PIDFILE-/var/run/chef/solr-indexer.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/$prog}
+config=${CONFIG-/etc/chef/server.rb}
+user=${USER-chef}
+group=${GROUP-chef}
+logfile=${LOGFILE-/var/log/chef/solr-indexer.log}
+
+start() {
+    echo -n "Starting $prog:"
+    daemon $prog -d -c "$config" -u "$user" -g "$group" -L "$logfile" "&>/dev/null"
+    RETVAL=$?
+    echo
+    [ $RETVAL -eq 0 ] && touch ${lockfile}
+    return $RETVAL
+}
+
+stop() {
+    echo -n "Stopping $prog: "
+    if [ -f $pidfile ]; then
+        killproc $prog
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+            failure;
+        fi;
+    else
+        RETVAL=1
+        failure;
+    fi
+    rm -f $lockfile
+    echo
+    return $RETVAL
+}
+
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  restart)
+        stop
+        start
+        ;;
+  condrestart)
+        if [ -f $lockfile ]; then
+            stop
+            start
+        fi
+        ;;
+  status)
+        status $prog
+        ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|condrestart|status}"
+    exit 1
+esac
+
+exit $RETVAL
diff --git a/chef/distro/redhat/etc/sysconfig/chef-server b/chef/distro/redhat/etc/sysconfig/chef-server
index 8686c361d6..83c39849fa 100644
--- a/chef/distro/redhat/etc/sysconfig/chef-server
+++ b/chef/distro/redhat/etc/sysconfig/chef-server
@@ -5,6 +5,6 @@
 #CONFIG=/etc/chef/server.rb
 #USER=chef
 #GROUP=chef
-#CLUSTER_NODES=2
+#CLUSTER_NODES=1
 #LOGFILE=/var/log/chef/merb.%s.log
 #OPTIONS=
diff --git a/chef/distro/redhat/etc/sysconfig/chef-server-webui b/chef/distro/redhat/etc/sysconfig/chef-server-webui
new file mode 100644
index 0000000000..29941c3e42
--- /dev/null
+++ b/chef/distro/redhat/etc/sysconfig/chef-server-webui
@@ -0,0 +1,10 @@
+# Configuration file for the chef-server-webui service
+
+#CHILDPIDFILES=/var/run/chef/server-webui.%s.pid
+#PIDFILE=/var/run/chef/server-webui.pid
+#CONFIG=/etc/chef/server.rb
+#USER=chef
+#GROUP=chef
+#CLUSTER_NODES=1
+#LOGFILE=/var/log/chef/merb-webui.%s.log
+#OPTIONS=
diff --git a/chef/distro/redhat/etc/sysconfig/chef-solr b/chef/distro/redhat/etc/sysconfig/chef-solr
new file mode 100644
index 0000000000..dde3895316
--- /dev/null
+++ b/chef/distro/redhat/etc/sysconfig/chef-solr
@@ -0,0 +1,9 @@
+# Configuration file for the chef-solr service
+
+#PIDFILE=/var/run/chef/solr.pid
+#CONFIG=/etc/chef/server.rb
+#USER=chef
+#GROUP=chef
+#LOGFILE=/var/log/chef/solr.log
+# options for Java.
+#OPTIONS=
diff --git a/chef/distro/redhat/etc/sysconfig/chef-solr-indexer b/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
new file mode 100644
index 0000000000..9c794d523a
--- /dev/null
+++ b/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
@@ -0,0 +1,7 @@
+# Configuration file for the chef-solr-indexer service
+
+#PIDFILE=/var/run/chef/solr-indexer.pid
+#CONFIG=/etc/chef/server.rb
+#USER=chef
+#GROUP=chef
+#LOGFILE=/var/log/chef/solr-indexer.log