Merge branch 'CHEF-2227'

12 files changed, 93 insertions, 92 deletions

diff --git a/chef/distro/arch/etc/conf.d/chef-solr-indexer.conf b/chef/distro/arch/etc/conf.d/chef-expander.conf
index e1c712d84a..4c70bdd2eb 100644
--- a/chef/distro/arch/etc/conf.d/chef-solr-indexer.conf
+++ b/chef/distro/arch/etc/conf.d/chef-expander.conf
@@ -1,8 +1,8 @@
-LOGFILE=/var/log/chef/solr-indexer.log
+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_SOLR_INDEXER_ARGS="-d -c $CONFIG -L $LOGFILE -u $USER -g $GROUP"
+CHEF_EXPANDER_ARGS="-d -c $CONFIG -L $LOGFILE -n 1 -i 1"
diff --git a/chef/distro/arch/etc/rc.d/chef-solr-indexer b/chef/distro/arch/etc/rc.d/chef-expander
index 3e89a59310..5925efe2b8 100644
--- a/chef/distro/arch/etc/rc.d/chef-solr-indexer
+++ b/chef/distro/arch/etc/rc.d/chef-expander
@@ -5,9 +5,9 @@
 # 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.
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-daemon_bin="/usr/bin/chef-solr-indexer"
+daemon_bin="/usr/bin/chef-expander"
 daemon_name=$(basename $daemon_bin)
 PIDF="/var/run/$daemon_name.pid"
 
@@ -33,7 +33,7 @@ case "$1" in
     PID=$(get_pid)
     if [ -z "$PID" ]; then
       [ -f $PIDF ] && rm -f $PIDF
-      $daemon_bin -P $PIDF $CHEF_SOLR_INDEXER_ARGS
+      $daemon_bin -P $PIDF $CHEF_EXPANDER_ARGS
       [ -n "$STARTTIME" ] && sleep $STARTTIME
       if [ $? -gt 0 ]; then
         stat_fail
diff --git a/chef/distro/debian/etc/default/chef-solr-indexer b/chef/distro/debian/etc/default/chef-expander
index 4064e95edc..3d855705ba 100644
--- a/chef/distro/debian/etc/default/chef-solr-indexer
+++ b/chef/distro/debian/etc/default/chef-expander
@@ -1,7 +1,8 @@
-LOGFILE=/var/log/chef/solr-indexer.log
+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/chef/distro/debian/etc/init.d/chef-solr-indexer b/chef/distro/debian/etc/init.d/chef-expander
index f8d20eafff..19b6c3e0d4 100755
--- a/chef/distro/debian/etc/init.d/chef-solr-indexer
+++ b/chef/distro/debian/etc/init.d/chef-expander
@@ -1,24 +1,24 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:           chef-solr-indexer
+# 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-solr-indexer.
+# Short-Description:  Start a chef-expander.
 ### END INIT INFO
 #
 # Copyright (c) 2009-2010 Opscode, Inc <legal@opscode.com>
 #
-# chef-solr-indexer         Startup script for chef-solr-indexer.
+# chef-expander         Startup script for chef-expander.
 # chkconfig: - 85 02
-# description: starts up chef-solr-indexer in daemon mode.
+# description: starts up chef-expander in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-solr-indexer
-NAME=chef-solr-indexer
-DESC=chef-solr-indexer
-PIDFILE=/var/run/chef/solr-indexer.pid
+DAEMON=/usr/bin/chef-expander
+NAME=chef-expander
+DESC=chef-expander
+PIDFILE=/var/run/chef/expander.pid
 
 test -x $DAEMON || exit 0
 
@@ -31,57 +31,57 @@ if [ ! -d /var/run/chef ]; then
   chown $USER:$GROUP /var/run/chef
 fi
 
-DAEMON_OPTS="-d -P $PIDFILE -c $CONFIG -L $LOGFILE -u $USER -g $GROUP"
+DAEMON_OPTS="-d -c $CONFIG -P $PIDFILE -L $LOGFILE $CHEF_EXPANDER_ARGS"
 
-running_pid() {                                                                 
+running_pid() {
   pid=$1
-  name=$2                                                                     
-  [ -z "$pid" ] && return 1                                                   
-  [ ! -d /proc/$pid ] &&  return 1                                            
+  name=$2
+  [ -z "$pid" ] && return 1
+  [ ! -d /proc/$pid ] &&  return 1
   cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | awk 'NR==2'`
-  [ "$cmd" != "$name" ] &&  return 1                                          
-  return 0 
-}   
+  [ "$cmd" != "$name" ] &&  return 1
+  return 0
+}
 
-running() {                                                                     
+running() {
   [ ! -f "$PIDFILE" ] && return 1
   pid=`cat $PIDFILE`
-  running_pid $pid $DAEMON || return 1                                        
+  running_pid $pid $DAEMON || return 1
   return 0
-}   
+}
 
-start_server() {                                                                
-  if [ -z "$DAEMONUSER" ] ; then                                          
-    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS                       
+start_server() {
+  if [ -z "$DAEMONUSER" ] ; then
+    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
   errcode=$?
   else
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \              
-      --chuid $DAEMONUSER \ 
-      --exec $DAEMON -- $DAEMON_OPTS                          
-    errcode=$?  
-  fi  
-  return $errcode                                                         
-}       
+    start-stop-daemon --start --quiet --pidfile $PIDFILE \
+      --chuid $DAEMONUSER \
+      --exec $DAEMON -- $DAEMON_OPTS
+    errcode=$?
+  fi
+  return $errcode
+}
 
-stop_server() {                                                                 
-   if [ -z "$DAEMONUSER" ] ; then                                          
-     killproc -p $PIDFILE $DAEMON                                        
+stop_server() {
+   if [ -z "$DAEMONUSER" ] ; then
+     killproc -p $PIDFILE $DAEMON
      errcode=$?
    else
-     start-stop-daemon --stop --quiet --pidfile $PIDFILE \               
-       --user $DAEMONUSER \ 
+     start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+       --user $DAEMONUSER \
        --exec $DAEMON
-     errcode=$?  
-   fi  
-   return $errcode                                                         
-}       
+     errcode=$?
+   fi
+   return $errcode
+}
 
-reload_server() {                                                               
-  [ ! -f "$PIDFILE" ] && return 1                                             
-  pid=pidofproc $PIDFILE # This is the daemon's pid                           
+reload_server() {
+  [ ! -f "$PIDFILE" ] && return 1
+  pid=pidofproc $PIDFILE # This is the daemon's pid
   /bin/kill -1 $pid
   return $?
-}   
+}
 
 force_stop() {
   [ ! -e "$PIDFILE" ] && return
@@ -109,7 +109,7 @@ case "$1" in
         exit 3
     fi
     if start_server ; then
-        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
         if  running ;  then
             log_end_msg 0
         else
diff --git a/chef/distro/debian/etc/init/chef-expander.conf b/chef/distro/debian/etc/init/chef-expander.conf
new file mode 100644
index 0000000000..21ff246307
--- /dev/null
+++ b/chef/distro/debian/etc/init/chef-expander.conf
@@ -0,0 +1,17 @@
+# 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 0; }
+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/chef/distro/debian/etc/init/chef-solr-indexer.conf b/chef/distro/debian/etc/init/chef-solr-indexer.conf
deleted file mode 100644
index 03c49ee5f5..0000000000
--- a/chef/distro/debian/etc/init/chef-solr-indexer.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# chef-solr-indexer - Chef Solr Indexer
-#
-# Chef Solr Indexer provides indexing of Solr for Chef Server
-
-description "Chef Solr Indexer"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-respawn limit 5 30
-
-pre-start script
-    test -x /usr/bin/chef-solr-indexer || { stop; exit 0; }
-end script
-
-exec /usr/bin/chef-solr-indexer -c /etc/chef/solr.rb -L /var/log/chef/solr-indexer.log
diff --git a/chef/distro/redhat/etc/init.d/chef-solr-indexer b/chef/distro/redhat/etc/init.d/chef-expander
index a5df5ce44e..f4fc9e90a8 100644
--- a/chef/distro/redhat/etc/init.d/chef-solr-indexer
+++ b/chef/distro/redhat/etc/init.d/chef-expander
@@ -1,12 +1,12 @@
 #!/bin/bash
 #
-# chef-solr-indexer Startup script for the Chef search indexer
+# 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-solr-indexer
+# 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
@@ -18,15 +18,15 @@
 # Source function library
 . /etc/init.d/functions
 
-exec="/usr/bin/chef-solr-indexer"
-prog="chef-solr-indexer"
+exec="/usr/bin/chef-expander"
+prog="chef-expander"
 
 [ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
-config=${CONFIG-/etc/chef/solr-indexer.rb}
-pidfile=${PIDFILE-/var/run/chef/solr-indexer.pid}
+config=${CONFIG-/etc/chef/expander.rb}
+pidfile=${PIDFILE-/var/run/chef/expander.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
-logfile=${LOGFILE-/var/log/chef/solr-indexer.log}
+logfile=${LOGFILE-/var/log/chef/expander.log}
 options=${OPTIONS-}
 
 start() {
@@ -42,7 +42,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog 
+    killproc -p $pidfile $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile
diff --git a/chef/distro/redhat/etc/init.d/chef-server b/chef/distro/redhat/etc/init.d/chef-server
index b15dd66bc8..44247178b5 100644
--- a/chef/distro/redhat/etc/init.d/chef-server
+++ b/chef/distro/redhat/etc/init.d/chef-server
@@ -7,8 +7,8 @@
 
 ### BEGIN INIT INFO
 # Provides: chef-server
-# Required-Start: $local_fs $network $remote_fs chef-solr chef-solr-indexer
-# Required-Stop: $local_fs $network $remote_fs chef-solr chef-solr-indexer
+# 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 
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-expander b/chef/distro/redhat/etc/logrotate.d/chef-expander
new file mode 100644
index 0000000000..d68b479de2
--- /dev/null
+++ b/chef/distro/redhat/etc/logrotate.d/chef-expander
@@ -0,0 +1,8 @@
+/var/log/chef/expander.log {
+  rotate 12
+  weekly
+  compress
+  postrotate
+    /etc/init.d/chef-expander condrestart >/dev/null || :
+  endscript
+}
diff --git a/chef/distro/redhat/etc/logrotate.d/chef-solr-indexer b/chef/distro/redhat/etc/logrotate.d/chef-solr-indexer
deleted file mode 100644
index 83e1b65452..0000000000
--- a/chef/distro/redhat/etc/logrotate.d/chef-solr-indexer
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chef/solr-indexer.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-solr-indexer condrestart >/dev/null || :
-  endscript
-}
diff --git a/chef/distro/redhat/etc/sysconfig/chef-expander b/chef/distro/redhat/etc/sysconfig/chef-expander
new file mode 100644
index 0000000000..9af06d6b3c
--- /dev/null
+++ b/chef/distro/redhat/etc/sysconfig/chef-expander
@@ -0,0 +1,7 @@
+# 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/chef/distro/redhat/etc/sysconfig/chef-solr-indexer b/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
deleted file mode 100644
index c15abd6251..0000000000
--- a/chef/distro/redhat/etc/sysconfig/chef-solr-indexer
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file for the chef-solr-indexer service
-
-#PIDFILE=/var/run/chef/solr-indexer.pid
-#CONFIG=/etc/chef/solr-indexer.rb
-#LOGFILE=/var/log/chef/solr-indexer.log
-# Any additional chef-solr-indexer options.
-#OPTIONS=