chef 0.7.16 → 0.8.2

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

@@ -14,15 +14,19 @@
 [ -f /etc/sysconfig/chef-client ] && . /etc/sysconfig/chef-client
 
 prog="chef-client"
-pidfile=${PIDFILE-/var/run/chef/chef-client.pid}
+pidfile=${PIDFILE-/var/run/chef/client.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/client.rb}
-logfile=${LOGFILE-/var/log/chef/chef-client.log}
-OPTIONS=
+user=${CHEF_USER-root}
+group=${CHEF_GROUP-root}
+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" -L "$logfile" "$OPTIONS" ">/dev/null"
+    daemon chef-client -d -c "$config" -i "$interval" -s "$splay" -L "$logfile" "$options" "&>/dev/null"
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch ${lockfile}

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

@@ -14,28 +14,29 @@
 [ -f /etc/sysconfig/chef-server ] && . /etc/sysconfig/chef-server
 
 prog="chef-server"
-PIDFILE=/var/run/chef/chef-server.pid
-LOCKFILE=/var/lock/subsys/$prog
-CONFIG=/etc/chef/server.rb
-USER="chef"
-GROUP="chef"
-CLUSTER_NODES=2
-LOGFILE=/var/log/chef/chef-server-merb.log
-OPTIONS=
+childpidfiles=${CHILDPIDFILES-/var/run/chef/server.%s.pid}
+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}
+options=${OPTIONS-}
 
 start() {
     echo -n "Starting $prog:"
-    daemon chef-server -d -c "$CLUSTER_NODES" -C "$CONFIG" -u "$USER" -G "$GROUP" -L "$LOGFILE" -P "$PIDFILE" "$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}
+    [ $RETVAL -eq 0 ] && touch ${lockfile}
     return $RETVAL
 }
 
 stop() {
     echo -n "Stopping $prog: "
-    if [ -f $PIDFILE ]; then
-        killproc chef-server
+    if [ -f $pidfile ]; then
+        killproc $prog
         RETVAL=$?
         if [ $RETVAL -ne 0 ]; then
             failure;
@@ -44,7 +45,7 @@ stop() {
         RETVAL=1
         failure;
     fi
-    rm -f $LOCKFILE
+    rm -f $lockfile
     echo
     return $RETVAL
 }
@@ -61,13 +62,13 @@ case "$1" in
         start
         ;;
   condrestart)
-        if [ -f $LOCKFILE ]; then
+        if [ -f $lockfile ]; then
             stop
             start
         fi
         ;;
   status)
-        status chef-server
+        status $prog
         ;;
   *)
     echo "Usage: $0 {start|stop|restart|condrestart|status}"

data/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=${CHEF_USER-chef}
+group=${CHEF_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

data/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=${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=$?
+    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

data/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=${CHEF_USER-chef}
+group=${CHEF_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

data/distro/redhat/etc/sysconfig/chef-client

@@ -0,0 +1,10 @@
+# Configuration file for the chef-client service
+
+#PIDFILE=/var/run/chef/client.pid
+#CONFIG=/etc/chef/client.rb
+#CHEF_USER=root
+#CHEF_GROUP=root
+#INTERVAL=1800
+#SPLAY=20
+#LOGFILE=/var/log/chef/client.log
+#OPTIONS=

data/distro/redhat/etc/sysconfig/chef-server

@@ -0,0 +1,10 @@
+# Configuration file for the chef-server service
+
+#CHILDPIDFILES=/var/run/chef/server.%s.pid
+#PIDFILE=/var/run/chef/server.pid
+#CONFIG=/etc/chef/server.rb
+#CHEF_USER=chef
+#CHEF_GROUP=chef
+#CLUSTER_NODES=1
+#LOGFILE=/var/log/chef/merb.%s.log
+#OPTIONS=

data/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
+#CHEF_USER=chef
+#CHEF_GROUP=chef
+#CLUSTER_NODES=1
+#LOGFILE=/var/log/chef/merb-webui.%s.log
+#OPTIONS=

data/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
+#CHEF_USER=chef
+#CHEF_GROUP=chef
+#LOGFILE=/var/log/chef/solr.log
+# options for Java. Need to start with -j followed by options..
+#OPTIONS="-j "

data/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
+#CHEF_USER=chef
+#CHEF_GROUP=chef
+#LOGFILE=/var/log/chef/solr-indexer.log

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

@@ -0,0 +1,121 @@
+#! /bin/sh
+# Copyright (c) 1995-2003 SuSE Linux AG, Nuernberg, Germany.
+# All rights reserved.
+#
+# Author: Mario Giammarco
+#
+### BEGIN INIT INFO
+# Provides:       chef-client
+# Required-Start: $remote_fs $syslog $named
+# Required-Stop:  $remote_fs $syslog
+# Default-Start:  3 5
+# Default-Stop:   0 1 2 6
+# Short-Description: Chef client
+# Description:    Starts chef client
+### END INIT INFO
+
+# First reset status of this service
+. /etc/rc.status
+rc_reset
+
+# Return values acc. to LSB for all commands but status:
+# 0 - success
+# 1 - generic or unspecified error
+# 2 - invalid or excess argument(s)
+# 3 - unimplemented feature (e.g. "reload")
+# 4 - insufficient privilege
+# 5 - program is not installed
+# 6 - program is not configured
+# 7 - program is not running
+
+# set default options
+CHEF_CONF="/etc/chef/client.rb"
+if [ ! -f ${CHEF_CONF} ]; then
+  echo -n "Chef client configuration file, ${CHEF_CONF} does not exist."
+  # Tell the user this has skipped
+  rc_status -s
+  exit 6
+fi
+
+CHEF_BIN="/usr/bin/chef-client"
+if [ ! -x ${CHEF_BIN} ]; then
+  echo -n "Chef client, ${CHEF_BIN} not installed!"
+  rc_status -s
+  exit 5
+fi
+
+CHEF_LOGFILE=/var/log/chef/chef-client.log
+CHEF_OPTIONS=""
+
+# set default PID variables
+CHEF_PID="/var/run/chef/chef-client.pid"
+CHEF_PID_NOPREFIX="/var/run/chef/chef-client.pid"
+
+function chef_is_running() {
+  $0 status >/dev/null
+}
+
+case "$1" in
+  start)
+
+    echo -n "Starting chef-client"
+
+    startproc $CHEF_BIN -d -c "$CHEF_CONF" -L "$CHEF_LOGFILE" "$CHEF_OPTIONS" ">/dev/null"
+
+    rc_status -v
+  ;;
+  stop)
+    echo -n "Shutting down chef client"
+    killproc -p ${CHEF_PID} -TERM $CHEF_BIN
+    rc_status -v
+    rm -f ${CHEF_PID} 2>/dev/null
+  ;;
+  try-restart)
+    $0 status
+    if test $? = 0; then
+      $0 restart $2
+    else
+      rc_reset        # Not running is not a failure.
+    fi
+    # Remember status and be quiet
+    rc_status
+  ;;
+  restart)
+    $0 stop
+    $0 start $2
+    rc_status
+  ;;
+  try-restart-iburst)
+    $0 status
+    if test $? = 0; then
+      $0 stop
+      $0 start iburst
+    else
+      rc_reset        # Not running is not a failure.
+    fi
+    # Remember status and be quiet
+    rc_status
+  ;;
+  force-reload)
+    # Does not support signalling to reload
+    $0 try-restart
+    rc_status
+  ;;
+  reload)
+    echo -n "Reload chef-client"
+    # Does not support signalling to reload
+    rc_failed 3
+    rc_status -v
+  ;;
+  status)
+    checkproc -p ${CHEF_PID} $CHEF_BIN
+    echo -n "Checking for chef-client "
+    checkproc -p ${CHEF_PID} $CHEF_BIN
+    rc_status -v
+  ;;
+  *)
+    echo "Usage: $0 {start|stop|status|try-restart|restart|try-restart-iburst|force-reload|reload|addserver|ntptimeset}"
+    exit 1
+  ;;
+esac
+rc_exit