chef 0.8.16 → 0.9.0.a3

data/distro/debian/etc/default/chef-client

@@ -0,0 +1,4 @@
+LOGFILE=/var/log/chef/client.log
+CONFIG=/etc/chef/client.rb
+INTERVAL=1800
+SPLAY=20

data/distro/debian/etc/default/chef-server

@@ -0,0 +1,6 @@
+LOGFILE=/var/log/chef/server.log
+CONFIG=/etc/chef/server.rb
+ADAPTER=thin
+PORT=4000
+USER=chef
+GROUP=chef

data/distro/debian/etc/default/chef-server-webui

@@ -0,0 +1,6 @@
+LOGFILE=/var/log/chef/server-webui.log
+CONFIG=/etc/chef/webui.rb
+ADAPTER=thin
+PORT=4040
+USER=chef
+GROUP=chef

data/distro/debian/etc/default/chef-solr

@@ -0,0 +1,4 @@
+LOGFILE=/var/log/chef/solr.log
+CONFIG=/etc/chef/solr.rb
+USER=chef
+GROUP=chef

data/distro/debian/etc/default/chef-solr-indexer

@@ -0,0 +1,4 @@
+LOGFILE=/var/log/chef/solr-indexer.log
+CONFIG=/etc/chef/solr.rb
+USER=chef
+GROUP=chef

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

@@ -1,86 +1,86 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:           chef-client
-# Required-Start:     $network
-# Required-Stop:      $network
+# Required-Start:     $remote_fs $network
+# Required-Stop:      $remote_fs $network
 # Default-Start:      2 3 4 5
 # Default-Stop:       0 1 6
 # Short-Description:  Start a chef-client.
 ### END INIT INFO
 #
-# Copyright (c) 2009 Joshua Timberman, <joshua@opscode.com>
+# Copyright (c) 2009-2010 Opscode, Inc, <legal@opscode.com>
 #
 # chef-client         Startup script for chef-client.
-# chkconfig: - 98 02
+# chkconfig: - 99 02
 # description: starts up chef-client in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/chef-client
 NAME=chef-client
 DESC=chef-client
-LOGDIR=/var/log/chef
-CONFIG=/etc/chef/client.rb
 PIDFILE=/var/run/chef/client.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
 fi
 
-DAEMON_OPTS="-d -c $CONFIG -i 1800 -s 20"
+DAEMON_OPTS="-L $LOGFILE -d -c $CONFIG -i $INTERVAL -s $SPLAY"
 
-running_pid() {
+running_pid() {                                                                 
   pid=$1
-  name=$2
-  [ -z "$pid" ] && return 1
-  [ ! -d /proc/$pid ] &&  return 1
+  name=$2                                                                     
+  [ -z "$pid" ] && return 1                                                   
+  [ ! -d /proc/$pid ] &&  return 1                                            
   cmd=`awk '/Name:/ {print $2}' /proc/$pid/status`
-  [ "$cmd" != "$name" ] &&  return 1
-  return 0
-}
+  [ "$cmd" != "$name" ] &&  return 1                                          
+  return 0 
+}   
 
-running() {
+running() {                                                                     
   [ ! -f "$PIDFILE" ] && return 1
   pid=`cat $PIDFILE`
-  running_pid $pid $NAME || return 1
+  running_pid $pid $NAME || return 1                                        
   return 0
-}
+}   
 
-start_server() {
-  if [ -z "$DAEMONUSER" ] ; then
-    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
+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
-}
+    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
+stop_server() {                                                                 
+   if [ -z "$DAEMONUSER" ] ; then                                          
+     killproc -p $PIDFILE $DAEMON                                        
      errcode=$?
    else
-     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-       --user $DAEMONUSER \
+     start-stop-daemon --stop --quiet --pidfile $PIDFILE \               
+       --user $DAEMONUSER \ 
        --exec $DAEMON
-     errcode=$?
-   fi
-   return $errcode
-}
+     errcode=$?  
+   fi  
+   return $errcode                                                         
+}       
 
-reload_server() {
-  [ ! -f "$PIDFILE" ] && return 1
-  pid=pidofproc $PIDFILE # This is the daemon's pid
+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
@@ -108,7 +108,7 @@ case "$1" in
         exit 0
     fi
     if start_server ; then
-        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
+        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
         if  running ;  then
             log_end_msg 0
         else

data/distro/debian/etc/init.d/chef-server

@@ -1,45 +1,45 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:           chef-server
-# Required-Start:     $network
-# Required-Stop:      $network
+# Required-Start:     $remote_fs $network rabbitmq-server couchdb
+# Required-Stop:      $remote_fs $network rabbitmq-server couchdb
 # Default-Start:      2 3 4 5
 # Default-Stop:       0 1 6
 # Short-Description:  Start a chef-server.
 ### END INIT INFO
 #
-# Copyright (c) 2009 Joshua Timberman, <joshua@opscode.com>
+# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
 #
 # chef-server         Startup script for chef-server.
-# chkconfig: - 98 02
+# chkconfig: - 90 02
 # description: starts up chef-server webui.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/chef-server
 PIDFILE=/var/run/chef/server.%s.pid
 MAINPID=/var/run/chef/server.main.pid
-LOGFILE=/var/log/chef/merb.%s.log
-MASTER=master
 NAME=chef-server
 DESC=chef-server
-DAEMON_OPTS="-d -c2 -P $PIDFILE -L $LOGFILE"
 
 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="-p $PORT -e production -d -a $ADAPTER -P $PIDFILE -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"
+
 running() {
   [ ! -f  "$MAINPID" ] &&  return 1
   pid=`cat $MAINPID`
-  name=$MASTER
   [ -z "$pid" ] && return 1
   [ ! -d /proc/$pid ] && return 1
-  cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | head -1 | awk -F:\  '{print $3}'`
-  [ "$cmd" != "$name" ] &&  return 1
+  (ps -fp $pid | egrep -q "merb.*(merb : master|worker.*$PORT)") || return 1
   return 0
 }
 

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

@@ -0,0 +1,121 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-server-webui
+# Required-Start:     $remote_fs $network chef-server
+# Required-Stop:      $remote_fs $network chef-server
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a chef-server-webui
+### END INIT INFO
+#
+# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
+#
+# chef-server-webui   Startup script for chef-server-webui.
+# chkconfig: - 95 02
+# description: starts up chef-server webui.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/chef-server-webui
+PIDFILE=/var/run/chef/server-webui.%s.pid
+MAINPID=/var/run/chef/server-webui.main.pid
+NAME=chef-server-webui
+DESC=chef-server-webui
+
+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="-p $PORT -e production -d -a $ADAPTER -P $PIDFILE -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"
+
+running() {
+  [ ! -f  "$MAINPID" ] &&  return 1
+  pid=`cat $MAINPID`
+  name=$WORKER
+  [ -z "$pid" ] && return 1
+  [ ! -d /proc/$pid ] && return 1
+  (ps -fp $pid | egrep -q "merb.*(merb : master|worker.*$PORT)") || return 1
+  return 0
+}
+
+start_server() {
+  $DAEMON $DAEMON_OPTS
+  errcode=$?
+  return $errcode
+}
+
+stop_server() {
+  $DAEMON -K all -P $PIDFILE
+  errcode=$?
+  return $errcode
+}
+
+reload_server() {
+  stop_server
+  start_server
+}
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting $DESC "
+    if running ;  then
+        log_progress_msg "apparently already running"
+        log_end_msg 0
+        exit 0
+    fi
+    if start_server ; then
+        sleep 1
+        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"
+    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
+    ;;
+  restart|force-reload)
+    log_daemon_msg "Restarting $DESC"
+    errcode=0
+    reload_server
+    running && errcode=$?
+    log_end_msg $errcode
+    ;;
+  status)
+    log_daemon_msg "Checking status of $DESC"
+    if running ;  then
+      log_progress_msg "running"
+      log_end_msg 0
+    else
+      log_progress_msg "apparently not running"
+      log_end_msg 1
+      exit 3
+    fi
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|status}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
+

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

@@ -0,0 +1,177 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-solr
+# Required-Start:     $remote_fs $network
+# Required-Stop:      $remote_fs $network
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a chef-solr.
+### END INIT INFO
+#
+# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
+#
+# chef-solr         Startup script for chef-solr.
+# chkconfig: - 84 02
+# description: starts up chef-solr in daemon mode.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/chef-solr
+DAEMON_NAME=java
+NAME=chef-solr
+DESC=chef-solr
+PIDFILE=/var/run/chef/solr.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' | head -1`
+  [ "$cmd" != "$name" ] &&  return 1                                          
+  return 0 
+}   
+
+running() {                                                                     
+  [ ! -f "$PIDFILE" ] && return 1
+  pid=`cat $PIDFILE`
+  running_pid $pid $DAEMON_NAME || 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
+