Remove old, outdated distro initscripts.

42 files changed, 0 insertions, 2048 deletions

diff --git a/distro/README b/distro/README
deleted file mode 100644
index 36f8b12118..0000000000
--- a/distro/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Init scripts meant to be used with a gem installation via the bootstrap
-cookbook.
diff --git a/distro/arch/etc/conf.d/chef-client.conf b/distro/arch/etc/conf.d/chef-client.conf
deleted file mode 100644
index efbead3149..0000000000
--- a/distro/arch/etc/conf.d/chef-client.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LOGFILE=/var/log/chef/client.log
-CONFIG=/etc/chef/client.rb
-INTERVAL=1800
-SPLAY=20
-CHEF_CLIENT_ARGS="-L $LOGFILE -d -c $CONFIG -i $INTERVAL -s $SPLAY"
diff --git a/distro/arch/etc/conf.d/chef-expander.conf b/distro/arch/etc/conf.d/chef-expander.conf
deleted file mode 100644
index 4c70bdd2eb..0000000000
--- a/distro/arch/etc/conf.d/chef-expander.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-LOGFILE=/var/log/chef/expander.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-DIETIME=5
-STARTTIME=5
-CHEF_EXPANDER_ARGS="-d -c $CONFIG -L $LOGFILE -n 1 -i 1"
diff --git a/distro/arch/etc/conf.d/chef-server-webui.conf b/distro/arch/etc/conf.d/chef-server-webui.conf
deleted file mode 100644
index a737a84aa6..0000000000
--- a/distro/arch/etc/conf.d/chef-server-webui.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-LOGFILE=/var/log/chef/server-webui.log
-CONFIG=/etc/chef/webui.rb
-ADAPTER=thin
-PORT=4040
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-STARTTIME=10
-DIETIME=5
-CHEF_SERVER_WEBUI_ARGS="-p $PORT -e production -d -a $ADAPTER -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"
diff --git a/distro/arch/etc/conf.d/chef-server.conf b/distro/arch/etc/conf.d/chef-server.conf
deleted file mode 100644
index 95518ce045..0000000000
--- a/distro/arch/etc/conf.d/chef-server.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-LOGFILE=/var/log/chef/server.log
-CONFIG=/etc/chef/server.rb
-ADAPTER=thin
-PORT=4000
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-STARTTIME=10
-DIETIME=5
-CHEF_SERVER_ARGS="-p $PORT -e production -d -a $ADAPTER -L $LOGFILE -C $CONFIG -u $USER -G $GROUP"
diff --git a/distro/arch/etc/conf.d/chef-solr.conf b/distro/arch/etc/conf.d/chef-solr.conf
deleted file mode 100644
index a4764a2a8e..0000000000
--- a/distro/arch/etc/conf.d/chef-solr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-LOGFILE=/var/log/chef/solr.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-DIETIME=5
-STARTTIME=5
-CHEF_SOLR_ARGS="-d -c $CONFIG -L $LOGFILE -u $USER -g $GROUP"
diff --git a/distro/arch/etc/rc.d/chef-client b/distro/arch/etc/rc.d/chef-client
deleted file mode 100644
index 6e2feb2e52..0000000000
--- a/distro/arch/etc/rc.d/chef-client
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-daemon_bin="/usr/bin/chef-client"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-  pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      $daemon_bin --pid $PIDF $CHEF_CLIENT_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &>/dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  run)
-    stat_busy "Triggering new run of $daemon_name daemon"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill -SIGUSR1 $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      stat_done
-    fi
-    ;;
-
-  *)
-    echo "usage: $) {start|stop|restart|status|run}"
-esac
diff --git a/distro/arch/etc/rc.d/chef-expander b/distro/arch/etc/rc.d/chef-expander
deleted file mode 100644
index 5925efe2b8..0000000000
--- a/distro/arch/etc/rc.d/chef-expander
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-daemon_bin="/usr/bin/chef-expander"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-  pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      $daemon_bin -P $PIDF $CHEF_EXPANDER_ARGS
-      [ -n "$STARTTIME" ] && sleep $STARTTIME
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &>/dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    [ -n "$DIETIME" ] && sleep $DIETIME
-    $0 start
-    [ -n "$STARTTIME" ] && sleep $STARTTIME
-    ;;
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-  *)
-    echo "usage: $) {start|stop|restart|status}"
-esac
diff --git a/distro/arch/etc/rc.d/chef-server b/distro/arch/etc/rc.d/chef-server
deleted file mode 100644
index 1ffbf8dce5..0000000000
--- a/distro/arch/etc/rc.d/chef-server
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-daemon_bin="/usr/bin/chef-server"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-  pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      $daemon_bin -P $PIDF $CHEF_SERVER_ARGS
-      [ -n "$STARTTIME" ] && sleep $STARTTIME
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &>/dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    [ -n "$DIETIME" ] && sleep $DIETIME
-    $0 start
-    [ -n "$STARTTIME" ] && sleep $STARTTIME
-    ;;
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-  *)
-    echo "usage: $) {start|stop|restart|status}"
-esac
diff --git a/distro/arch/etc/rc.d/chef-server-webui b/distro/arch/etc/rc.d/chef-server-webui
deleted file mode 100644
index bec185151f..0000000000
--- a/distro/arch/etc/rc.d/chef-server-webui
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-daemon_bin="/usr/bin/chef-server-webui"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-  pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      $daemon_bin -P $PIDF $CHEF_SERVER_WEBUI_ARGS
-      [ -n "$STARTTIME" ] && sleep $STARTTIME
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &>/dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    [ -n "$DIETIME" ] && sleep $DIETIME
-    $0 start
-    [ -n "$STARTTIME" ] && sleep $STARTTIME
-    ;;
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-  *)
-    echo "usage: $) {start|stop|restart|status}"
-esac
diff --git a/distro/arch/etc/rc.d/chef-solr b/distro/arch/etc/rc.d/chef-solr
deleted file mode 100644
index 10bd15ea08..0000000000
--- a/distro/arch/etc/rc.d/chef-solr
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-daemon_bin="/usr/bin/chef-solr"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-  pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name"
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      $daemon_bin -P $PIDF $CHEF_SOLR_ARGS
-      [ -n "$STARTTIME" ] && sleep $STARTTIME
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &>/dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    [ -n "$DIETIME" ] && sleep $DIETIME
-    $0 start
-    [ -n "$STARTTIME" ] && sleep $STARTTIME
-    ;;
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-  *)
-    echo "usage: $) {start|stop|restart|status}"
-esac
diff --git a/distro/debian/etc/default/chef-client b/distro/debian/etc/default/chef-client
deleted file mode 100644
index a6413a30d4..0000000000
--- a/distro/debian/etc/default/chef-client
+++ /dev/null
@@ -1,4 +0,0 @@
-LOGFILE=/var/log/chef/client.log
-CONFIG=/etc/chef/client.rb
-INTERVAL=1800
-SPLAY=20
diff --git a/distro/debian/etc/default/chef-expander b/distro/debian/etc/default/chef-expander
deleted file mode 100644
index 3d855705ba..0000000000
--- a/distro/debian/etc/default/chef-expander
+++ /dev/null
@@ -1,8 +0,0 @@
-LOGFILE=/var/log/chef/expander.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-DIETIME=5
-STARTTIME=5
-CHEF_EXPANDER_ARGS="-n 1 -i 1"
diff --git a/distro/debian/etc/default/chef-server b/distro/debian/etc/default/chef-server
deleted file mode 100644
index b91a3ce81c..0000000000
--- a/distro/debian/etc/default/chef-server
+++ /dev/null
@@ -1,9 +0,0 @@
-LOGFILE=/var/log/chef/server.log
-CONFIG=/etc/chef/server.rb
-ADAPTER=thin
-PORT=4000
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-STARTTIME=10
-DIETIME=5
diff --git a/distro/debian/etc/default/chef-server-webui b/distro/debian/etc/default/chef-server-webui
deleted file mode 100644
index 50dd22a288..0000000000
--- a/distro/debian/etc/default/chef-server-webui
+++ /dev/null
@@ -1,9 +0,0 @@
-LOGFILE=/var/log/chef/server-webui.log
-CONFIG=/etc/chef/webui.rb
-ADAPTER=thin
-PORT=4040
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-STARTTIME=10
-DIETIME=5
diff --git a/distro/debian/etc/default/chef-solr b/distro/debian/etc/default/chef-solr
deleted file mode 100644
index 7f5220c058..0000000000
--- a/distro/debian/etc/default/chef-solr
+++ /dev/null
@@ -1,8 +0,0 @@
-LOGFILE=/var/log/chef/solr.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
-# Sleep to give daemon enough time to fully start or stop.
-DIETIME=5
-STARTTIME=5
-MAXTRIES=20
diff --git a/distro/debian/etc/init.d/chef-client b/distro/debian/etc/init.d/chef-client
deleted file mode 100755
index b74f6d914b..0000000000
--- a/distro/debian/etc/init.d/chef-client
+++ /dev/null
@@ -1,212 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-client
-# 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-2010 Opscode, Inc, <legal@opscode.com>
-#
-# chef-client         Startup script for chef-client.
-# 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=$(which chef-client)
-NAME=chef-client
-DESC=chef-client
-PIDFILE=/var/run/chef/client.pid
-
-test -x $DAEMON || exit 1
-
-. /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 -P $PIDFILE -c $CONFIG -i $INTERVAL -s $SPLAY"
-
-if [ ! -z $LOGFILE ]; then
-  DAEMON_OPTS="${DAEMON_OPTS} -L $LOGFILE"
-fi
-
-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() {
-  if [ -z "$DAEMONUSER" ] ; then
-     killproc -p $PIDFILE $DAEMON -HUP
-     errcode=$?
-   else
-     start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \
-       --user $DAEMONUSER \
-       --exec $DAEMON
-     errcode=$?
-   fi
-   return $errcode
-}
-
-run_server() {
-  if [ -z "$DAEMONUSER" ] ; then
-     killproc -p $PIDFILE $DAEMON -USR1
-     errcode=$?
-   else
-     start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE \
-       --user $DAEMONUSER \
-       --exec $DAEMON
-     errcode=$?
-   fi
-   return $errcode
-}
-
-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
-    if running ; then
-      stop_server || errcode=$?
-      [ -n "$DIETIME" ] && sleep $DIETIME
-    fi
-    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)
-    if running; then
-      log_daemon_msg "Reloading $DESC" "$NAME"
-      errcode=0
-      reload_server || errcode=$?
-      log_end_msg $errcode
-    fi
-    ;;
-  run)
-    if running; then
-      log_daemon_msg "Triggering run of $DESC" "$NAME"
-      errcode=0
-      run_server || errcode=$?
-      log_end_msg $errcode
-    fi
-    ;;
-  *)
-    N=/etc/init.d/$NAME
-    echo "Usage: $N {start|stop|force-stop|restart|force-reload|status|run}" >&2
-    exit 1
-    ;;
-esac
-
-exit 0
-
diff --git a/distro/debian/etc/init.d/chef-expander b/distro/debian/etc/init.d/chef-expander
deleted file mode 100755
index fdf6e40678..0000000000
--- a/distro/debian/etc/init.d/chef-expander
+++ /dev/null
@@ -1,176 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-expander
-# 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-expander.
-### END INIT INFO
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
-#
-# chef-expander         Startup script for chef-expander.
-# chkconfig: - 85 02
-# description: starts up chef-expander in daemon mode.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=$(which chef-expander)
-NAME=chef-expander
-DESC=chef-expander
-PIDFILE=/var/run/chef/expander.pid
-
-test -x $DAEMON || exit 1
-
-. /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 -c $CONFIG -P $PIDFILE -L $LOGFILE $CHEF_EXPANDER_ARGS"
-
-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 0b94fc7fc7..0000000000
--- a/distro/debian/etc/init.d/chef-server
+++ /dev/null
@@ -1,122 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:           chef-server
-# 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-2010 Opscode, Inc <legal@opscode.com>
-#
-# chef-server         Startup script for chef-server.
-# chkconfig: - 90 02
-# description: starts up chef-server webui.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=$(which chef-server)
-PIDFILE=/var/run/chef/server.%s.pid
-MAINPID=/var/run/chef/server.main.pid
-NAME=chef-server
-DESC=chef-server
-
-test -x $DAEMON || exit 1
-
-. /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`
-  [ -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
-  [ -n "$DIETIME" ] && sleep $DIETIME
-  start_server
-  [ -n "$STARTTIME" ] && sleep $STARTTIME
-}
-
-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
-        [ -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"
-    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/etc/init.d/chef-server-webui b/distro/debian/etc/init.d/chef-server-webui
deleted file mode 100755
index e2db8a49b7..0000000000
--- a/distro/debian/etc/init.d/chef-server-webui
+++ /dev/null
@@ -1,123 +0,0 @@
-#! /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=$(which 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 1
-
-. /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
-  [ -n "$DIETIME" ] && sleep $DIETIME
-  start_server
-  [ -n "$STARTTIME" ] && sleep $STARTTIME
-}
-
-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
-        [ -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"
-    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/etc/init.d/chef-solr b/distro/debian/etc/init.d/chef-solr
deleted file mode 100755
index 2cc93b5fd2..0000000000
--- a/distro/debian/etc/init.d/chef-solr
+++ /dev/null
@@ -1,176 +0,0 @@
-#! /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=$(which chef-solr)
-DAEMON_NAME=java
-NAME=chef-solr
-DESC=chef-solr
-PIDFILE=/var/run/chef/solr.pid
-
-test -x $DAEMON || exit 1
-
-. /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
-
-if [ ! -f $LOGFILE ]; then
-  touch $LOGFILE
-  chown $USER:$GROUP $LOGFILE
-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() {
-  start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
-  errcode=$?
-  for i in `seq 0 $MAXTRIES`
-  do
-    if running; then
-      errcode=0
-      break
-    else
-      [ -n "$STARTTIME" ] && sleep $STARTTIME
-    fi
-  done
-  return $errcode
-}
-
-stop_server() {
-   killproc -p $PIDFILE $DAEMON
-   errcode=$?
-   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/chef-client.conf b/distro/debian/etc/init/chef-client.conf
deleted file mode 100644
index 5f246b140c..0000000000
--- a/distro/debian/etc/init/chef-client.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# chef-client - Chef Configuration Management Client
-#
-# Chef Client provides the Chef configuration management daemon
-
-description "Chef Client"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-client || { stop; exit 1; }
-end script
-
-exec /usr/bin/chef-client -i 1800 -L /var/log/chef/client.log
diff --git a/distro/debian/etc/init/chef-expander.conf b/distro/debian/etc/init/chef-expander.conf
deleted file mode 100644
index 2c08f6cecc..0000000000
--- a/distro/debian/etc/init/chef-expander.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# chef-expander - Chef Expander
-#
-# Chef Expander provides indexing of Solr for Chef Server
-
-description "Chef Expander"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-expander || { stop; exit 1; }
-end script
-
-exec /usr/bin/chef-expander -c /etc/chef/solr.rb -L /var/log/chef/expander.log -n 1 -i 1
diff --git a/distro/debian/etc/init/chef-server-webui.conf b/distro/debian/etc/init/chef-server-webui.conf
deleted file mode 100644
index 8ba25877e4..0000000000
--- a/distro/debian/etc/init/chef-server-webui.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# chef-server-webui - Chef Server WebUI
-#
-# Chef Server WebUI provides the browser-accessible UI to the Chef Server API
-
-description "Chef Server WebUI"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-server-webui || { stop; exit 1; }
-end script
-
-exec /usr/bin/chef-server-webui -e production -p 4040 -L /var/log/chef/server-webui.log
diff --git a/distro/debian/etc/init/chef-server.conf b/distro/debian/etc/init/chef-server.conf
deleted file mode 100644
index a372e50ea3..0000000000
--- a/distro/debian/etc/init/chef-server.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# chef-server - Chef Server
-#
-# Chef Server provides the Chef API server
-
-description "Chef Server API"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-server || { stop; exit 1; }
-end script
-
-exec /usr/bin/chef-server -e production -p 4000 -L /var/log/chef/server.log
diff --git a/distro/debian/etc/init/chef-solr.conf b/distro/debian/etc/init/chef-solr.conf
deleted file mode 100644
index edca5e3f80..0000000000
--- a/distro/debian/etc/init/chef-solr.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# chef-solr - Chef Solr
-#
-# Chef Solr provides Solr search for Chef Server
-
-description "Chef Solr"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-solr || { stop; exit 1; }
-end script
-
-exec /usr/bin/chef-solr -c /etc/chef/solr.rb -L /var/log/chef/solr.log
diff --git a/distro/redhat/etc/init.d/chef-client b/distro/redhat/etc/init.d/chef-client
deleted file mode 100644
index b41150e7a1..0000000000
--- a/distro/redhat/etc/init.d/chef-client
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-#
-# chef-client Startup script for the Chef client
-#
-# chkconfig: - 98 02
-# description: Client component of the Chef systems integration framework.
-
-### 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
-
-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}
-logfile=${LOGFILE-/var/log/chef/client.log}
-interval=${INTERVAL-1800}
-splay=${SPLAY-20}
-options=${OPTIONS-}
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon chef-client -d -c "$config" -L "$logfile" -P "$pidfile" -i "$interval" -s "$splay" "$options"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p $pidfile chef-client
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart () {
-    stop
-    start
-}
-
-reload() {
-    echo -n $"Reloading $prog: "
-    killproc -p $pidfile chef-client -HUP
-    retval=$?
-    echo
-    return $retval
-}
-
-run() {
-    echo -n $"Triggering run of $prog: "
-    killproc -p $pidfile chef-client -USR1
-    retval=$?
-    echo
-    return $retval
-}
-
-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)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    run)
-        $1
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|run}"
-        exit 2
-esac
-exit $?
diff --git a/distro/redhat/etc/init.d/chef-expander b/distro/redhat/etc/init.d/chef-expander
deleted file mode 100644
index 82ae34dd62..0000000000
--- a/distro/redhat/etc/init.d/chef-expander
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-#
-# chef-expander Startup script for the Chef search indexer
-#
-# chkconfig: - 95 05
-# description: Search indexer component of the Chef Server.
-
-### BEGIN INIT INFO
-# Provides: chef-expander
-# 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
-
-exec="/usr/bin/chef-expander"
-prog="chef-expander"
-
-[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-config=${CONFIG-/etc/chef/expander.rb}
-pidfile=${PIDFILE-/var/run/chef/expander.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-logfile=${LOGFILE-/var/log/chef/expander.log}
-options=${OPTIONS-}
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon $prog -d -c "$config" -L "$logfile" -P "$pidfile" "$options"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $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)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    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 $?
diff --git a/distro/redhat/etc/init.d/chef-server b/distro/redhat/etc/init.d/chef-server
deleted file mode 100644
index f956dd4e45..0000000000
--- a/distro/redhat/etc/init.d/chef-server
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-#
-# chef-server Startup script for chef-server
-#
-# 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-expander
-# Required-Stop: $local_fs $network $remote_fs chef-solr chef-expander
-# 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
-
-exec="/usr/bin/chef-server"
-prog="chef-server"
-
-[ -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}
-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() {
-    [ -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
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $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)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    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 $?
diff --git a/distro/redhat/etc/init.d/chef-server-webui b/distro/redhat/etc/init.d/chef-server-webui
deleted file mode 100644
index 65498bf723..0000000000
--- a/distro/redhat/etc/init.d/chef-server-webui
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-#
-# chef-server-webui Startup script for chef-server-webui
-#
-# 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
-
-exec="/usr/bin/chef-server-webui"
-prog="chef-server-webui"
-
-[ -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}
-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() {
-    [ -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
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $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)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    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 $?
diff --git a/distro/redhat/etc/init.d/chef-solr b/distro/redhat/etc/init.d/chef-solr
deleted file mode 100644
index 9223173276..0000000000
--- a/distro/redhat/etc/init.d/chef-solr
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-#
-# chef-solr Startup script for the SOLR search engine
-#
-# 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
-
-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}
-logfile=${LOGFILE-/var/log/chef/solr.log}
-options=${OPTIONS-}
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-    daemon $prog -d -c "$config" -L "$logfile" -P "$pidfile" "$options"
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog
-    retval=$?
-    echo
-    [ $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)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    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 $?
diff --git a/distro/redhat/etc/logrotate.d/chef-client b/distro/redhat/etc/logrotate.d/chef-client
deleted file mode 100644
index 5e99edbf9a..0000000000
--- a/distro/redhat/etc/logrotate.d/chef-client
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chef/client.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-client condrestart >/dev/null || :
-  endscript
-}
diff --git a/distro/redhat/etc/logrotate.d/chef-expander b/distro/redhat/etc/logrotate.d/chef-expander
deleted file mode 100644
index d68b479de2..0000000000
--- a/distro/redhat/etc/logrotate.d/chef-expander
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chef/expander.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-expander condrestart >/dev/null || :
-  endscript
-}
diff --git a/distro/redhat/etc/logrotate.d/chef-server b/distro/redhat/etc/logrotate.d/chef-server
deleted file mode 100644
index 8e2ebde311..0000000000
--- a/distro/redhat/etc/logrotate.d/chef-server
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chef/server.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-server condrestart >/dev/null || :
-  endscript
-}
diff --git a/distro/redhat/etc/logrotate.d/chef-server-webui b/distro/redhat/etc/logrotate.d/chef-server-webui
deleted file mode 100644
index d8781fe200..0000000000
--- a/distro/redhat/etc/logrotate.d/chef-server-webui
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chef/server-webui.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-server-webui condrestart >/dev/null || :
-  endscript
-}
diff --git a/distro/redhat/etc/logrotate.d/chef-solr b/distro/redhat/etc/logrotate.d/chef-solr
deleted file mode 100644
index 54f18fe196..0000000000
--- a/distro/redhat/etc/logrotate.d/chef-solr
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chef/solr.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-solr condrestart >/dev/null || :
-  endscript
-}
diff --git a/distro/redhat/etc/sysconfig/chef-client b/distro/redhat/etc/sysconfig/chef-client
deleted file mode 100644
index c65de74539..0000000000
--- a/distro/redhat/etc/sysconfig/chef-client
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration file for the chef-client service
-
-#CONFIG=/etc/chef/client.rb
-#PIDFILE=/var/run/chef/client.pid
-#LOCKFILE=/var/lock/subsys/chef-client
-#LOGFILE=/var/log/chef/client.log
-# Sleep interval between runs.
-# This value is in seconds.
-#INTERVAL=1800
-# Maximum amount of random delay before starting a run. Prevents every client
-# from contacting the server at the exact same time.
-# This value is in seconds.
-#SPLAY=20
-# Any additional chef-client options.
-#OPTIONS=
diff --git a/distro/redhat/etc/sysconfig/chef-expander b/distro/redhat/etc/sysconfig/chef-expander
deleted file mode 100644
index 9af06d6b3c..0000000000
--- a/distro/redhat/etc/sysconfig/chef-expander
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file for the chef-expander service
-
-#PIDFILE=/var/run/chef/expander.pid
-#CONFIG=/etc/chef/expander.rb
-#LOGFILE=/var/log/chef/expander.log
-# Any additional chef-expander options.
-OPTIONS="-n 1 -i 1"
diff --git a/distro/redhat/etc/sysconfig/chef-server b/distro/redhat/etc/sysconfig/chef-server
deleted file mode 100644
index 6b18090ba9..0000000000
--- a/distro/redhat/etc/sysconfig/chef-server
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration file for the chef-server service
-
-#CONFIG=/etc/chef/server.rb
-#PIDFILE=/var/run/chef/server.pid
-#LOCKFILE=/var/lock/subsys/chef-server
-#LOGFILE=/var/log/chef/server.log
-#PORT=4000
-#ENVIRONMENT=production
-#ADAPTER=thin
-#CHILDPIDFILES=/var/run/chef/server.%s.pid
-#SERVER_USER=chef
-#SERVER_GROUP=chef
-# Any additional chef-server options.
-#OPTIONS=
diff --git a/distro/redhat/etc/sysconfig/chef-server-webui b/distro/redhat/etc/sysconfig/chef-server-webui
deleted file mode 100644
index c08df36147..0000000000
--- a/distro/redhat/etc/sysconfig/chef-server-webui
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration file for the chef-server-webui service
-
-#CONFIG=/etc/chef/webui.rb
-#PIDFILE=/var/run/chef/server-webui.pid
-#LOCKFILE=/var/lock/subsys/chef-server-webui
-#LOGFILE=/var/log/chef/server-webui.log
-#PORT=4040
-#ENVIRONMENT=production
-#ADAPTER=thin
-#CHILDPIDFILES=/var/run/chef/server-webui.%s.pid
-#SERVER_USER=chef
-#SERVER_GROUP=chef
-# Any additional chef-server-webui options.
-#OPTIONS=
diff --git a/distro/redhat/etc/sysconfig/chef-solr b/distro/redhat/etc/sysconfig/chef-solr
deleted file mode 100644
index 31d99f1f1c..0000000000
--- a/distro/redhat/etc/sysconfig/chef-solr
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration file for the chef-solr service
-
-#CONFIG=/etc/chef/solr.rb
-#PIDFILE=/var/run/chef/solr.pid
-#LOCKFILE=/var/lock/subsys/chef-solr
-#LOGFILE=/var/log/chef/solr.log
-# Options for Java. Need to start with -j followed by options.
-#OPTIONS="-j "
diff --git a/distro/windows/service_manager.rb b/distro/windows/service_manager.rb
deleted file mode 100644
index 3cd3335b93..0000000000
--- a/distro/windows/service_manager.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$stderr.puts "WARNING: service_manager.rb is changed to: chef-service-manager"
-$stderr.puts "Please use chef-service-manager instead of service_manager.rb to install and manage chef-client as a windows service."