chef 0.8.16 → 0.9.0.a3

data/distro/redhat/etc/init.d/chef-server-webui

@@ -1,78 +1,112 @@
 #!/bin/bash
-# Startup script for chef-server-webui
 #
-# chkconfig: - 66 34
-# description: Server component of the Chef systems integration framework.
-# processname: chef-server-webui
+# chef-server-webui Startup script for chef-server-webui
 #
-# config: /etc/sysconfig/chef-server-webui
-# pidfile: /var/run/chef/chef-server-webui.pid
+# chkconfig: - 97 03
+# description: Server WebUI component of the Chef systems integration framework.
+
+### BEGIN INIT INFO
+# Provides: chef-server-webui
+# Required-Start: $local_fs $network $remote_fs chef-sever
+# Required-Stop: $local_fs $network $remote_fs chef-server
+# Should-Start: $named $time
+# Should-Stop: $named $time
+# Short-Description: Startup script for chef-server-webui 
+# Description: Server WebUI component of the Chef systems integration framework.
+### END INIT INFO
 
 # Source function library
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/chef-server-webui ] && . /etc/sysconfig/chef-server-webui
-
+exec="/usr/bin/chef-server-webui"
 prog="chef-server-webui"
-childpidfiles=${CHILDPIDFILES-/var/run/chef/server-webui.%s.pid}
+
+[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+config=${CONFIG-/etc/chef/webui.rb}
 pidfile=${PIDFILE-/var/run/chef/server-webui.main.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-config=${CONFIG-/etc/chef/server.rb}
-user=${CHEF_USER-chef}
-group=${CHEF_GROUP-chef}
-cluster_nodes=${CLUSTER_NODES-1}
-logfile=${LOGFILE-/var/log/chef/merb-webui.%s.log}
+logfile=${LOGFILE-/var/log/chef/server-webui.log}
+port=${PORT-4040}
+env=${ENVIRONMENT-production}
+adapter=${ADAPTER-thin}
+childpidfiles=${CHILDPIDFILES-/var/run/chef/server-webui.%s.pid}
+user=${SERVER_USER-chef}
+group=${SERVER_GROUP-chef}
 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=$?
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon $prog -d -C "$config" -L "$logfile" -p "$port" -e "$env" \
+                 -a "$adapter" -P "$childpidfiles" -u "$user" -G "$group" \
+                 "$options" "&>/dev/null"
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch ${lockfile}
-    return $RETVAL
+    [ $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 -n $"Stopping $prog: "
+    killproc -p $pidfile $prog 
+    retval=$?
     echo
-    return $RETVAL
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart () {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status -p $pidfile $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
 }
 
 case "$1" in
-  start)
-        start
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
         ;;
-  stop)
-        stop
+    restart)
+        $1
         ;;
-  restart)
-        stop
-        start
+    reload)
+        rh_status_q || exit 7
+        $1
         ;;
-  condrestart)
-        if [ -f $lockfile ]; then
-            stop
-            start
-        fi
+    force-reload)
+        force_reload
         ;;
-  status)
-        status $prog
+    status)
+        rh_status
         ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?

data/distro/redhat/etc/init.d/chef-solr

@@ -1,76 +1,104 @@
 #!/bin/bash
-# Startup script for chef-solr
+# 
+# chef-solr Startup script for the SOLR search engine
 #
-# 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
+# chkconfig: - 94 06
+# description: SOLR search engine for the Chef Server.
+
+### BEGIN INIT INFO
+# Provides: chef-solr
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Should-Start: $named $time
+# Should-Stop: $named $time
+# Short-Description: Startup script for the SOLR search engine
+# Description: SOLR search engine for the Chef Server.
+### END INIT INFO
 
 # Source function library
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/chef-solr ] && . /etc/sysconfig/chef-solr
-
+exec="/usr/bin/chef-solr"
 prog="chef-solr"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+config=${CONFIG-/etc/chef/solr.rb}
 pidfile=${PIDFILE-/var/run/chef/solr.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-config=${CONFIG-/etc/chef/server.rb}
-user=${CHEF_USER-chef}
-group=${CHEF_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" "$options" "&>/dev/null"
-    RETVAL=$?
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon $prog -d -c "$config" -L "$logfile" "$options"
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch ${lockfile}
-    return $RETVAL
+    [ $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 -n $"Stopping $prog: "
+    killproc -p $pidfile $prog 
+    retval=$?
     echo
-    return $RETVAL
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart () {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status -p $pidfile $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
 }
 
 case "$1" in
-  start)
-        start
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
         ;;
-  stop)
-        stop
+    restart)
+        $1
         ;;
-  restart)
-        stop
-        start
+    reload)
+        rh_status_q || exit 7
+        $1
         ;;
-  condrestart)
-        if [ -f $lockfile ]; then
-            stop
-            start
-        fi
+    force-reload)
+        force_reload
         ;;
-  status)
-        status $prog
+    status)
+        rh_status
         ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?

data/distro/redhat/etc/init.d/chef-solr-indexer

@@ -1,75 +1,104 @@
 #!/bin/bash
-# Startup script for chef-solr-indexer
 #
-# chkconfig: - 66 34
-# description: Search indexer component of Chef Server.
-# processname: chef-solr-indexer
+# chef-solr-indexer Startup script for the Chef search indexer
 #
-# config: /etc/sysconfig/chef-solr-indexer
-# pidfile: /var/run/chef/chef-solr-indexer.pid
+# chkconfig: - 95 05
+# description: Search indexer component of the Chef Server.
+
+### BEGIN INIT INFO
+# Provides: chef-solr-indexer
+# Required-Start: $local_fs $network $remote_fs chef-solr rabbitmq-server
+# Required-Stop: $local_fs $network $remote_fs chef-solr rabbitmq-server
+# Should-Start: $named $time
+# Should-Stop: $named $time
+# Short-Description: Startup script for the Chef search indexer
+# Description: Search indexer component of the Chef Server.
+### END INIT INFO
 
 # Source function library
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/chef-solr-indexer ] && . /etc/sysconfig/chef-solr-indexer
-
+exec="/usr/bin/chef-solr-indexer"
 prog="chef-solr-indexer"
+
+[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+config=${CONFIG-/etc/chef/solr-indexer.rb}
 pidfile=${PIDFILE-/var/run/chef/solr-indexer.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-config=${CONFIG-/etc/chef/server.rb}
-user=${CHEF_USER-chef}
-group=${CHEF_GROUP-chef}
 logfile=${LOGFILE-/var/log/chef/solr-indexer.log}
+options=${OPTIONS-}
 
 start() {
-    echo -n "Starting $prog:"
-    daemon $prog -d -c "$config" -u "$user" -g "$group" -L "$logfile" "&>/dev/null"
-    RETVAL=$?
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon $prog -d -c "$config" -L "$logfile" "$options"
+    retval=$?
     echo
-    [ $RETVAL -eq 0 ] && touch ${lockfile}
-    return $RETVAL
+    [ $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 -n $"Stopping $prog: "
+    killproc -p $pidfile $prog 
+    retval=$?
     echo
-    return $RETVAL
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart () {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status -p $pidfile $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
 }
 
 case "$1" in
-  start)
-        start
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
         ;;
-  stop)
-        stop
+    restart)
+        $1
         ;;
-  restart)
-        stop
-        start
+    reload)
+        rh_status_q || exit 7
+        $1
         ;;
-  condrestart)
-        if [ -f $lockfile ]; then
-            stop
-            start
-        fi
+    force-reload)
+        force_reload
         ;;
-  status)
-        status $prog
+    status)
+        rh_status
         ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
 esac
-
-exit $RETVAL
+exit $?