chef 0.8.16 → 0.9.0.a3

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

@@ -0,0 +1,176 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-solr-indexer
+# Required-Start:     $remote_fs $network rabbitmq-server chef-solr
+# Required-Stop:      $remote_fs $network rabbitmq-server chef-solr
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a chef-solr-indexer.
+### END INIT INFO
+#
+# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
+#
+# chef-solr-indexer         Startup script for chef-solr-indexer.
+# chkconfig: - 85 02
+# description: starts up chef-solr-indexer in daemon mode.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/chef-solr-indexer
+NAME=chef-solr-indexer
+DESC=chef-solr-indexer
+PIDFILE=/var/run/chef/solr-indexer.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+if [ ! -d /var/run/chef ]; then
+  mkdir /var/run/chef
+  chown $USER:$GROUP /var/run/chef
+fi
+
+DAEMON_OPTS="-d -P $PIDFILE -c $CONFIG -L $LOGFILE -u $USER -g $GROUP"
+
+running_pid() {                                                                 
+  pid=$1
+  name=$2                                                                     
+  [ -z "$pid" ] && return 1                                                   
+  [ ! -d /proc/$pid ] &&  return 1                                            
+  cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | awk 'NR==2'`
+  [ "$cmd" != "$name" ] &&  return 1                                          
+  return 0 
+}   
+
+running() {                                                                     
+  [ ! -f "$PIDFILE" ] && return 1
+  pid=`cat $PIDFILE`
+  running_pid $pid $DAEMON || return 1                                        
+  return 0
+}   
+
+start_server() {                                                                
+  if [ -z "$DAEMONUSER" ] ; then                                          
+    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS                       
+  errcode=$?
+  else
+    start-stop-daemon --start --quiet --pidfile $PIDFILE \              
+      --chuid $DAEMONUSER \ 
+      --exec $DAEMON -- $DAEMON_OPTS                          
+    errcode=$?  
+  fi  
+  return $errcode                                                         
+}       
+
+stop_server() {                                                                 
+   if [ -z "$DAEMONUSER" ] ; then                                          
+     killproc -p $PIDFILE $DAEMON                                        
+     errcode=$?
+   else
+     start-stop-daemon --stop --quiet --pidfile $PIDFILE \               
+       --user $DAEMONUSER \ 
+       --exec $DAEMON
+     errcode=$?  
+   fi  
+   return $errcode                                                         
+}       
+
+reload_server() {                                                               
+  [ ! -f "$PIDFILE" ] && return 1                                             
+  pid=pidofproc $PIDFILE # This is the daemon's pid                           
+  /bin/kill -1 $pid
+  return $?
+}   
+
+force_stop() {
+  [ ! -e "$PIDFILE" ] && return
+  if running ; then
+    /bin/kill -15 $pid
+    sleep "$DIETIME"s
+    if running ; then
+      /bin/kill -9 $pid
+      sleep "$DIETIME"s
+      if running ; then
+        echo "Cannot kill $NAME (pid=$pid)!"
+        exit 1
+      fi
+    fi
+  fi
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC " "$NAME"
+    if running ;  then
+        log_progress_msg "apparently already running"
+        log_end_msg 0
+        exit 3
+    fi
+    if start_server ; then
+        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+        if  running ;  then
+            log_end_msg 0
+        else
+            log_end_msg 1
+        fi
+    else
+        log_end_msg 1
+    fi
+    ;;
+  stop)
+    log_daemon_msg "Stopping $DESC" "$NAME"
+    if running ; then
+      errcode=0
+      stop_server || errcode=$?
+      log_end_msg $errcode
+    else
+      log_progress_msg "apparently not running"
+      log_end_msg 0
+      exit 0
+    fi
+    ;;
+  force-stop)
+    $0 stop
+    if running; then
+      log_daemon_msg "Stopping (force) $DESC" "$NAME"
+      errcode=0
+      force_stop || errcode=$?
+      log_end_msg $errcode
+    fi
+    ;;
+  restart|force-reload)
+    log_daemon_msg "Restarting $DESC" "$NAME"
+    errcode=0
+    stop_server || errcode=$?
+    [ -n "$DIETIME" ] && sleep $DIETIME
+    start_server || errcode=$?
+    [ -n "$STARTTIME" ] && sleep $STARTTIME
+    running || errcode=$?
+    log_end_msg $errcode
+    ;;
+  status)
+    log_daemon_msg "Checking status of $DESC" "$NAME"
+    if running ;  then
+      log_progress_msg "running"
+      log_end_msg 0
+    else
+      log_progress_msg "apparently not running"
+      log_end_msg 1
+      exit 1
+    fi
+    ;;
+  reload)
+    log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+    log_warning_msg "cannot re-read the config file (use restart)."
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
+

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

@@ -1,78 +1,106 @@
 #!/bin/bash
-# Startup script for chef-client
+# 
+# chef-client Startup script for the Chef client
 #
 # chkconfig: - 98 02
 # description: Client component of the Chef systems integration framework.
-# processname: chef-client
-#
-# config: /etc/sysconfig/chef-client
-# pidfile: /var/run/chef/chef-client.pid
+
+### BEGIN INIT INFO
+# Provides: chef-client
+# 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 Chef client
+# Description: Client component of the Chef systems integration framework.
+### END INIT INFO
 
 # Source function library
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/chef-client ] && . /etc/sysconfig/chef-client
-
+exec="/usr/bin/chef-client"
 prog="chef-client"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+config=${CONFIG-/etc/chef/client.rb}
 pidfile=${PIDFILE-/var/run/chef/client.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-config=${CONFIG-/etc/chef/client.rb}
-user=${CHEF_USER-root}
-group=${CHEF_GROUP-root}
+logfile=${LOGFILE-/var/log/chef/client.log}
 interval=${INTERVAL-1800}
 splay=${SPLAY-20}
-logfile=${LOGFILE-/var/log/chef/client.log}
 options=${OPTIONS-}
 
 start() {
-    echo -n "Starting $prog:"
-    daemon chef-client -d -c "$config" -i "$interval" -s "$splay" -L "$logfile" "$options" "&>/dev/null"
-    RETVAL=$?
+    [ -x $exec ] || exit 5
+    [ -f $config ] || exit 6
+    echo -n $"Starting $prog: "
+    daemon chef-client -d -c "$config" -L "$logfile" -i "$interval" -s "$splay" "$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 chef-client
-        RETVAL=$?
-        if [ $RETVAL -ne 0 ]; then
-            failure;
-        fi;
-    else
-        RETVAL=1
-        failure;
-    fi
-    rm -f $lockfile
+    echo -n $"Stopping $prog: "
+    killproc -p $pidfile chef-client
+    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 chef-client
+    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-server

@@ -1,78 +1,112 @@
 #!/bin/bash
-# Startup script for chef-server
 #
-# chkconfig: - 65 35
-# description: Server component of the Chef systems integration framework.
-# processname: chef-server
+# chef-server Startup script for chef-server
 #
-# config: /etc/sysconfig/chef-server
-# pidfile: /var/run/chef/chef-server.pid
+# chkconfig: - 96 04
+# description: Server component of the Chef systems integration framework.
+
+### BEGIN INIT INFO
+# Provides: chef-server
+# Required-Start: $local_fs $network $remote_fs chef-solr chef-solr-indexer
+# Required-Stop: $local_fs $network $remote_fs chef-solr chef-solr-indexer
+# Should-Start: $named $time
+# Should-Stop: $named $time
+# Short-Description: Startup script for chef-server 
+# Description: Server component of the Chef systems integration framework.
+### END INIT INFO
 
 # Source function library
 . /etc/init.d/functions
 
-[ -f /etc/sysconfig/chef-server ] && . /etc/sysconfig/chef-server
-
+exec="/usr/bin/chef-server"
 prog="chef-server"
-childpidfiles=${CHILDPIDFILES-/var/run/chef/server.%s.pid}
+
+[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+config=${CONFIG-/etc/chef/server.rb}
 pidfile=${PIDFILE-/var/run/chef/server.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.%s.log}
+logfile=${LOGFILE-/var/log/chef/server.log}
+port=${PORT-4000}
+env=${ENVIRONMENT-production}
+adapter=${ADAPTER-thin}
+childpidfiles=${CHILDPIDFILES-/var/run/chef/server.%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 $?