chef-559, move distro to chef, include in gem

13 files changed, 0 insertions, 1014 deletions

diff --git a/distro/debian/etc/init.d/chef-client b/distro/debian/etc/init.d/chef-client
deleted file mode 100755
index 02e1d2f114..0000000000
--- a/distro/debian/etc/init.d/chef-client
+++ /dev/null
@@ -1,175 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-client
-# Required-Start:     $network
-# Required-Stop:      $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>
-#
-# chef-client         Startup script for chef-client.
-# chkconfig: - 98 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
-
-if [ ! -d /var/run/chef ]; then
-  mkdir /var/run/chef
-fi
-
-DAEMON_OPTS="-d -c $CONFIG -i 1800 -s 20"
-
-running_pid() {
-  pid=$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
-}
-
-running() {
-  [ ! -f "$PIDFILE" ] && return 1
-  pid=`cat $PIDFILE`
-  running_pid $pid $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 0
-    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 3
-    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
-
diff --git a/distro/debian/etc/init.d/chef-indexer b/distro/debian/etc/init.d/chef-indexer
deleted file mode 100755
index 37126083d5..0000000000
--- a/distro/debian/etc/init.d/chef-indexer
+++ /dev/null
@@ -1,175 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-indexer
-# Required-Start:     $network
-# Required-Stop:      $network
-# Default-Start:      2 3 4 5
-# Default-Stop:       0 1 6
-# Short-Description:  Start a chef-indexer.
-### END INIT INFO
-#
-# Copyright (c) 2009 Joshua Timberman, <joshua@opscode.com>
-#
-# chef-indexer         Startup script for chef-indexer.
-# chkconfig: - 98 02
-# description: starts up chef-indexer in daemon mode.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-indexer
-NAME=chef-indexer
-DESC=chef-indexer
-LOGDIR=/var/log/chef
-CONFIG=/etc/chef/indexer.rb
-PIDFILE=/var/run/chef/indexer.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -d /var/run/chef ]; then
-  mkdir /var/run/chef
-fi
-
-DAEMON_OPTS="-d -c $CONFIG"
-
-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
-
diff --git a/distro/debian/etc/init.d/chef-server b/distro/debian/etc/init.d/chef-server
deleted file mode 100755
index b116b78414..0000000000
--- a/distro/debian/etc/init.d/chef-server
+++ /dev/null
@@ -1,120 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-server
-# Required-Start:     $network
-# Required-Stop:      $network
-# 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>
-#
-# chef-server         Startup script for chef-server.
-# chkconfig: - 98 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
-
-if [ ! -d /var/run/chef ]; then
-  mkdir /var/run/chef
-fi
-
-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
-  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
-
diff --git a/distro/debian/man/man1/chef-indexer.1 b/distro/debian/man/man1/chef-indexer.1
deleted file mode 100644
index e6dea91883..0000000000
--- a/distro/debian/man/man1/chef-indexer.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH CHEF-INDEXER: "1" "August 2009" "chef-indexer 0.7.8" "User Commands"
-.SH NAME
-chef-indexer: \- Runs the search index process.
-.SH SYNOPSIS
-.B chef-indexer
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-chef-indexer requires that the stompserver be started but at this time the stompserver package does not install a startup script, let alone start the daemon. I am working with the package maintainer for stompserver to include a startup script.
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-Daemonize the process
-.TP
-\fB\-g\fR, \fB\-\-group\fR GROUP
-Group to change gid to before daemonizing
-.TP
-\fB\-l\fR, \fB\-\-log_level\fR LEVEL
-Set the log level (debug, info, warn, error, fatal)
-.TP
-\fB\-L\fR, \fB\-\-logfile\fR LOGLOCATION
-Set the log file location, defaults to STDOUT \- recommended for daemonizing
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-User to change uid to before daemonizing
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-indexer is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam@ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua@opscode.com> with help2man. Permission is granted
-to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-
-On Debian systems, the complete text of the Apache 2.0 License can be found in
-/usr/share/common-licenses/Apache-2.0.
diff --git a/distro/debian/man/man1/chef-server.1 b/distro/debian/man/man1/chef-server.1
deleted file mode 100644
index fa5eb71d7e..0000000000
--- a/distro/debian/man/man1/chef-server.1
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
-.TH CHEF-SERVER "1" "August 2009" "chef-server" "User Commands"
-.SH NAME
-chef-server \- Start the Chef Server merb application slice.
-.SH SYNOPSIS
-.B chef-server
-[\fIuGdcIpPhmailLerkKX\fR] [\fIargument\fR]
-.SH DESCRIPTION
-The Chef Server is a Merb application slice. Both chef-server and chef-server-slice packages should be installed. This man page was generated for merb and generated for chef-server.
-The default listen port is 4000. At a minimum, chef-server should be started with \-c2 so one process starts for the webui (4000) and one process starts for openid (4001).
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-This flag is for having chef-server run as a user other than the one currently logged in. Note: if you set this you must also provide a \fB\-\-group\fR option for it to take effect.
-.TP
-\fB\-G\fR, \fB\-\-group\fR GROUP
-This flag is for having chef-server run as a group other than the one currently logged in. Note: if you set this you must also provide a \fB\-\-user\fR option for it to take effect.
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-This will run a single chef-server in the background.
-.TP
-\fB\-N\fR, \fB\-\-no\-daemonize\fR
-This will allow you to run a cluster in console mode
-.TP
-\fB\-c\fR, \fB\-\-cluster\-nodes\fR NUM_MERBS
-Number of merb daemons to run for chef-server. At least 2 are required to run, the second is for openid (runs on port 4001).
-.TP
-\fB\-I\fR, \fB\-\-init\-file\fR FILE
-File to use for initialization on load, defaults to config/init.rb
-.TP
-\fB\-p\fR, \fB\-\-port\fR PORTNUM
-Port to run chef-server on, defaults to 4000. Additional nodes (\-c) listen on incrementing port numbers.
-.TP
-\fB\-o\fR, \fB\-\-socket\-file\fR FILE
-Socket file to run chef-server on, defaults to [Merb.root]/log/merb.sock. This is for web servers, like thin, that use sockets.Specify this *only* if you *must*.
-.TP
-\fB\-s\fR, \fB\-\-socket\fR SOCKNUM
-Socket number to run chef-server on, defaults to 0.
-.TP
-\fB\-n\fR, \fB\-\-name\fR NAME
-Set the name of the application. This is used in the process title and log file names.
-.TP
-\fB\-P\fR, \fB\-\-pid\fR PIDFILE
-PID file, defaults to [Merb.root]/log/merb.main.pid for the master process and[Merb.root]/log/merb.[port number].pid for worker processes. For clusters, use %s to specify where in the file chef-server should place the port number. For instance: \fB\-P\fR myapp.%s.pid
-.TP
-\fB\-h\fR, \fB\-\-host\fR HOSTNAME
-Host to bind to (default is 0.0.0.0).
-.HP
-\fB\-m\fR, \fB\-\-merb\-root\fR /path/to/approot The path to the Merb.root for the app you want to run (default is current working directory).
-.TP
-\fB\-a\fR, \fB\-\-adapter\fR ADAPTER
-The rack adapter to use to run chef-server (default is mongrel)[mongrel, emongrel, thin, ebb, fastcgi, webrick]
-.TP
-\fB\-R\fR, \fB\-\-rackup\fR FILE
-Load an alternate Rack config file (default is config/rack.rb)
-.TP
-\fB\-i\fR, \fB\-\-irb\-console\fR
-This flag will start chef-server in irb console mode. All your models and other classes will be available for you in an irb session.
-.TP
-\fB\-S\fR, \fB\-\-sandbox\fR
-This flag will enable a sandboxed irb console. If your ORM supports transactions, all edits will be rolled back on exit.
-.TP
-\fB\-l\fR, \fB\-\-log\-level\fR LEVEL
-Log levels can be set to any of these options: debug < info < warn < error < fatal (default is info)
-.TP
-\fB\-L\fR, \fB\-\-log\fR LOGFILE
-A string representing the logfile to use. Defaults to [Merb.root]/log/merb.[main].log for the master process and [Merb.root]/log/merb[port number].logfor worker processes
-.TP
-\fB\-e\fR, \fB\-\-environment\fR STRING
-Environment to run Merb under [development, production, testing] (default is development)
-.HP
-\fB\-r\fR ['RUBY CODE'| FULL_SCRIPT_PATH]
-.TP
-\fB\-\-script\-runner\fR
-Command\-line option to run scripts and/or code in the chef-server app.
-.TP
-\fB\-K\fR, \fB\-\-graceful\fR PORT or all
-Gracefully kill chef-server proceses by port number.  Use chef-server \fB\-K\fR all to gracefully kill all merbs.
-.TP
-\fB\-k\fR, \fB\-\-kill\fR PORT
-Force kill one merb worker by port number. This will cause the worker tobe respawned.
-.TP
-\fB\-\-fast\-deploy\fR
-Reload the code, but not yourinit.rb or gems
-.TP
-\fB\-X\fR, \fB\-\-mutex\fR on/off
-This flag is for turning the mutex lock on and off.
-.TP
-\fB\-D\fR, \fB\-\-debugger\fR
-Run chef-server using rDebug.
-.TP
-\fB\-V\fR, \fB\-\-verbose\fR
-Print extra information
-.TP
-\fB\-C\fR, \fB\-\-console\-trap\fR
-Enter an irb console on ^C
-.TP
-\-?, \fB\-H\fR, \fB\-\-help\fR
-Show this help message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-server is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam@ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua@opscode.com> with help2man
-for the Debian project (but may be used by others).. Permission is granted
-  to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-
-  On Debian systems, the complete text of the Apache 2.0 License can be found in
-  /usr/share/common-licenses/Apache-2.0.
diff --git a/distro/debian/man/man8/chef-client.8 b/distro/debian/man/man8/chef-client.8
deleted file mode 100644
index b9ebce9a7e..0000000000
--- a/distro/debian/man/man8/chef-client.8
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH CHEF-CLIENT: "8" "August 2009" "chef-client 0.7.8" "System Administration Utilities"
-.SH NAME
-chef-client: \- Runs a client node connecting to a chef-server.
-.SH SYNOPSIS
-.B chef-client
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-\fB\-S\fR, \fB\-\-server\fR CHEFSERVERURL
-The chef server URL
-.TP
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-Daemonize the process
-.TP
-\fB\-g\fR, \fB\-\-group\fR GROUP
-Group to set privilege to
-.TP
-\fB\-i\fR, \fB\-\-interval\fR SECONDS
-Run chef\-client periodically, in seconds
-.TP
-\fB\-j\fR JSON_ATTRIBS
-Load attributes from a JSON file or URL
-.HP
-\fB\-\-json\-attributes\fR
-.TP
-\fB\-l\fR, \fB\-\-log_level\fR LEVEL
-Set the log level (debug, info, warn, error, fatal)
-.TP
-\fB\-L\fR, \fB\-\-logfile\fR LOGLOCATION
-Set the log file location, defaults to STDOUT \- recommended for daemonizing
-.TP
-\fB\-N\fR, \fB\-\-node\-name\fR NODE_NAME
-The node name for this client
-.TP
-\fB\-s\fR, \fB\-\-splay\fR SECONDS
-The splay time for running at intervals, in seconds
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-User to set privilege to
-.TP
-\fB\-t\fR, \fB\-\-token\fR TOKEN
-Set the openid validation token
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-client is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam@ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua@opscode.com> with help2man. Permission is granted
-to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-
-On Debian systems, the complete text of the Apache 2.0 License can be found in
-/usr/share/common-licenses/Apache-2.0.
diff --git a/distro/debian/man/man8/chef-solo.8 b/distro/debian/man/man8/chef-solo.8
deleted file mode 100644
index a2e841715c..0000000000
--- a/distro/debian/man/man8/chef-solo.8
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH CHEF-SOLO: "8" "August 2009" "chef-solo 0.7.8" "System Administration Utilities"
-.SH NAME
-chef-solo: \- Runs chef in solo mode against a specified cookbook location.
-.SH SYNOPSIS
-.B chef-solo
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-d\fR, \fB\-\-daemonize\fR
-Daemonize the process
-.TP
-\fB\-g\fR, \fB\-\-group\fR GROUP
-Group to set privilege to
-.TP
-\fB\-i\fR, \fB\-\-interval\fR SECONDS
-Run chef\-client periodically, in seconds
-.TP
-\fB\-j\fR JSON_ATTRIBS
-Load attributes from a JSON file or URL
-.HP
-\fB\-\-json\-attributes\fR
-.TP
-\fB\-l\fR, \fB\-\-log_level\fR LEVEL
-Set the log level (debug, info, warn, error, fatal)
-.TP
-\fB\-L\fR, \fB\-\-logfile\fR LOGLOCATION
-Set the log file location, defaults to STDOUT
-.TP
-\fB\-N\fR, \fB\-\-node\-name\fR NODE_NAME
-The node name for this client
-.TP
-\fB\-r\fR, \fB\-\-recipe\-url\fR RECIPE_URL
-Pull down a remote gzipped tarball of recipes and untar it to the cookbook cache.
-.TP
-\fB\-s\fR, \fB\-\-splay\fR SECONDS
-The splay time for running at intervals, in seconds
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-User to set privilege to
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-solo is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam@ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua@opscode.com> with help2man. Permission is granted
-to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-
-On Debian systems, the complete text of the Apache 2.0 License can be found in
-/usr/share/common-licenses/Apache-2.0.
diff --git a/distro/redhat/etc/chef/client.rb b/distro/redhat/etc/chef/client.rb
deleted file mode 100644
index 5be5f35114..0000000000
--- a/distro/redhat/etc/chef/client.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Chef Client Config File
-#
-
-log_level        :info
-ssl_verify_mode  :verify_none
-registration_url "http://127.0.0.1:4000"
-openid_url       "http://127.0.0.1:4001"
-template_url     "http://127.0.0.1:4000"
-remotefile_url   "http://127.0.0.1:4000"
-search_url       "http://127.0.0.1:4000"
-
-pid_file         "/var/run/chef/chef-client.pid"
-
-#interval	 1800
-#splay           0
diff --git a/distro/redhat/etc/chef/indexer.rb b/distro/redhat/etc/chef/indexer.rb
deleted file mode 100644
index 1be9c9f0d2..0000000000
--- a/distro/redhat/etc/chef/indexer.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Chef Server Config File
-#
-
-log_level          :info
-search_index_path  "/var/lib/chef/search_index"
-
-Chef::Log::Formatter.show_time = false
-
-pid_file           "/var/run/chef/chef-indexer.pid"
diff --git a/distro/redhat/etc/chef/server.rb b/distro/redhat/etc/chef/server.rb
deleted file mode 100644
index 6d2a7794e0..0000000000
--- a/distro/redhat/etc/chef/server.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Chef Server Config File
-#
-
-log_level          :info
-ssl_verify_mode    :verify_none
-registration_url   "http://cserver:4000"
-openid_url         "http://cserver:4001"
-template_url       "http://cserver:4000"
-remotefile_url     "http://cserver:4000"
-search_url         "http://cserver:4000"
-cookbook_path      [ "/var/lib/chef/site-cookbooks", "/var/lib/chef/cookbooks" ]
-
-merb_root          "/var/lib/chef/merb"
-node_path          "/etc/chef/node"
-file_store_path    "/var/lib/chef/store"
-search_index_path  "/var/lib/chef/search_index"
-openid_store_path  "/var/lib/chef/openid/db"
-openid_cstore_path "/var/lib/chef/openid/cstore"
-file_cache_path    "/var/lib/chef/cache"
-
-Chef::Log::Formatter.show_time = false
diff --git a/distro/redhat/etc/init.d/chef-client b/distro/redhat/etc/init.d/chef-client
deleted file mode 100644
index 332e9606d9..0000000000
--- a/distro/redhat/etc/init.d/chef-client
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-# Startup script for 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
-
-# Source function library
-. /etc/init.d/functions
-
-[ -f /etc/sysconfig/chef-client ] && . /etc/sysconfig/chef-client
-
-prog="chef-client"
-pidfile=${PIDFILE-/var/run/chef/chef-client.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-config=${CONFIG-/etc/chef/client.rb}
-logfile=${LOGFILE-/var/log/chef/chef-client.log}
-OPTIONS=
-
-start() {
-    echo -n "Starting $prog:"
-    daemon chef-client -d -c "$config" -L "$logfile" "$OPTIONS" ">/dev/null"
-    RETVAL=$?
-    echo
-    [ $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
-    return $RETVAL
-}
-
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart)
-        stop
-        start
-        ;;
-  condrestart)
-        if [ -f $lockfile ]; then
-            stop
-            start
-        fi
-        ;;
-  status)
-        status chef-client
-        ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
-esac
-
-exit $RETVAL
diff --git a/distro/redhat/etc/init.d/chef-indexer b/distro/redhat/etc/init.d/chef-indexer
deleted file mode 100644
index a6375de395..0000000000
--- a/distro/redhat/etc/init.d/chef-indexer
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-# Startup script for chef-indexer
-#
-# chkconfig: - 75 25
-# description: Server component of the Chef systems integration framework.
-# processname: chef-indexer
-#
-# config: /etc/sysconfig/chef-indexer
-# pidfile: /var/run/chef/chef-indexer.pid
-
-# Source function library
-. /etc/init.d/functions
-
-[ -f /etc/sysconfig/chef-indexer ] && . /etc/sysconfig/chef-indexer
-
-prog="chef-indexer"
-PIDFILE=/var/run/chef/chef-indexer.pid
-LOCKFILE=/var/lock/subsys/$prog
-CONFIG=/etc/chef/indexer.rb
-USER="chef"
-GROUP="chef"
-LOGFILE=/var/log/chef/chef-indexer.log
-OPTIONS=
-
-start() {
-    echo -n "Starting $prog:"
-    daemon chef-indexer -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 chef-indexer
-        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 chef-indexer
-        ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
-esac
-
-exit $RETVAL
diff --git a/distro/redhat/etc/init.d/chef-server b/distro/redhat/etc/init.d/chef-server
deleted file mode 100644
index c8ad5c24d1..0000000000
--- a/distro/redhat/etc/init.d/chef-server
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-# Startup script for chef-server
-#
-# chkconfig: - 65 35
-# description: Server component of the Chef systems integration framework.
-# processname: chef-server
-#
-# config: /etc/sysconfig/chef-server
-# pidfile: /var/run/chef/chef-server.pid
-
-# Source function library
-. /etc/init.d/functions
-
-[ -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=
-
-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"
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch ${LOCKFILE}
-    return $RETVAL
-}
-
-stop() {
-    echo -n "Stopping $prog: "
-    if [ -f $PIDFILE ]; then
-        killproc chef-server
-        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 chef-server
-        ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|condrestart|status}"
-    exit 1
-esac
-
-exit $RETVAL