Skip to content

Commit 94bb09b

Browse files
mdkentmdkent
committed
CHEF-676: Update redhat init scripts to reflect latest work in the rpms.
Add the sysconfig files for redhat since they are used by the init scripts. Add README regarding the purpose of these files.
1 parent add11b9 commit 94bb09b

7 files changed

Lines changed: 62 additions & 24 deletions

File tree

‎chef/distro/README‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Init scripts meant to be used with a gem installation via the bootstrap
2+
cookbook.

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ prog="chef-client"
1717
pidfile=${PIDFILE-/var/run/chef/client.pid}
1818
lockfile=${LOCKFILE-/var/lock/subsys/$prog}
1919
config=${CONFIG-/etc/chef/client.rb}
20-
options=${OPTIONS--i 1800 -s 20}
20+
user=${USER-root}
21+
group=${GROUP-root}
22+
interval=${INTERVAL-1800}
23+
splay=${SPLAY-20}
24+
logfile=${LOGFILE-/var/log/chef/client.log}
25+
options=${OPTIONS-}
2126

2227
start() {
2328
echo -n "Starting $prog:"
24-
daemon chef-client -d -c "$config" "$options" ">/dev/null"
29+
daemon chef-client -d -c "$config" -i "$interval" -s "$splay" -L "$logfile" "$options" ">/dev/null"
2530
RETVAL=$?
2631
echo
2732
[ $RETVAL -eq 0 ] && touch ${lockfile}

‎chef/distro/redhat/etc/init.d/chef-indexer‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,26 @@
55
# description: Server component of the Chef systems integration framework.
66
# processname: chef-indexer
77
#
8+
# config: /etc/sysconfig/chef-indexer
89
# pidfile: /var/run/chef/chef-indexer.pid
910

1011
# Source function library
1112
. /etc/init.d/functions
1213

14+
[ -f /etc/sysconfig/chef-indexer ] && . /etc/sysconfig/chef-indexer
15+
1316
prog="chef-indexer"
14-
pidfile=/var/run/chef/indexer.pid
15-
lockfile=/var/lock/subsys/$prog
16-
config=/etc/chef/indexer.rb
17-
user="root"
18-
group="root"
17+
pidfile=${PIDFILE-/var/run/chef/indexer.pid}
18+
lockfile=${LOCKFILE-/var/lock/subsys/$prog}
19+
config=${CONFIG-/etc/chef/indexer.rb}
20+
user=${USER-root}
21+
group=${GROUP-root}
22+
logfile=${LOGFILE-/var/log/chef/indexer.log}
23+
options=${OPTIONS-}
1924

2025
start() {
2126
echo -n "Starting $prog:"
22-
daemon chef-indexer -d -c "$config" -u "$user" -g "$group" -L /var/log/chef/indexer.log "&>/dev/null"
27+
daemon chef-indexer -d -c "$config" -u "$user" -g "$group" -L "$logfile" "$options" ">/dev/null"
2328
RETVAL=$?
2429
echo
2530
[ $RETVAL -eq 0 ] && touch ${lockfile}
@@ -69,4 +74,3 @@ case "$1" in
6974
esac
7075

7176
exit $RETVAL
72-

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,29 @@
1313

1414
[ -f /etc/sysconfig/chef-server ] && . /etc/sysconfig/chef-server
1515

16-
# TODO: should be more like chef-client init
1716
prog="chef-server"
18-
CHILDPIDFILES=/var/run/chef/server.%s.pid
19-
PIDFILE=/var/run/chef/server.main.pid
20-
LOCKFILE=/var/lock/subsys/$prog
21-
CONFIG=/etc/chef/server.rb
22-
USER="root"
23-
GROUP="root"
24-
CLUSTER_NODES=2
25-
LOGFILE=/var/log/chef/merb.%s.log
26-
OPTIONS=
17+
childpidfiles=${CHILDPIDFILES-/var/run/chef/server.%s.pid}
18+
pidfile=${PIDFILE-/var/run/chef/server.main.pid}
19+
lockfile=${LOCKFILE-/var/lock/subsys/$prog}
20+
config=${CONFIG-/etc/chef/server.rb}
21+
user=${USER-root}
22+
group=${GROUP-root}
23+
cluster_nodes=${CLUSTER_NODES-2}
24+
logfile=${LOGFILE-/var/log/chef/merb.%s.log}
25+
options=${OPTIONS-}
2726

2827
start() {
2928
echo -n "Starting $prog:"
30-
daemon chef-server -d -c "$CLUSTER_NODES" -C "$CONFIG" -u "$USER" -G "$GROUP" -L "$LOGFILE" -P "$CHILDPIDFILES" "$OPTIONS" ">/dev/null"
29+
daemon chef-server -d -c "$cluster_nodes" -C "$config" -u "$user" -G "$group" -L "$logfile" -P "$childpidfiles" "$options" ">/dev/null"
3130
RETVAL=$?
3231
echo
33-
[ $RETVAL -eq 0 ] && touch ${LOCKFILE}
32+
[ $RETVAL -eq 0 ] && touch ${lockfile}
3433
return $RETVAL
3534
}
3635

3736
stop() {
3837
echo -n "Stopping $prog: "
39-
if [ -f $PIDFILE ]; then
38+
if [ -f $pidfile ]; then
4039
killproc chef-server
4140
RETVAL=$?
4241
if [ $RETVAL -ne 0 ]; then
@@ -46,7 +45,7 @@ stop() {
4645
RETVAL=1
4746
failure;
4847
fi
49-
rm -f $LOCKFILE
48+
rm -f $lockfile
5049
echo
5150
return $RETVAL
5251
}
@@ -63,7 +62,7 @@ case "$1" in
6362
start
6463
;;
6564
condrestart)
66-
if [ -f $LOCKFILE ]; then
65+
if [ -f $lockfile ]; then
6766
stop
6867
start
6968
fi

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Configuration file for the chef-client service
2+
3+
#PIDFILE=/var/run/chef/client.pid
4+
#CONFIG=/etc/chef/client.rb
5+
#USER=root
6+
#GROUP=root
7+
#INTERVAL=1800
8+
#SPLAY=20
9+
#LOGFILE=/var/log/chef/client.log
10+
#OPTIONS=

‎chef/distro/redhat/etc/sysconfig/chef-indexer‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Configuration file for the chef-server service
2+
3+
#PIDFILE=/var/run/chef/indexer.pid
4+
#CONFIG=/etc/chef/indexer.rb
5+
#USER=root
6+
#GROUP=root
7+
#LOGFILE=/var/log/chef/indexer.log
8+
#OPTIONS=

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Configuration file for the chef-server service
2+
3+
#CHILDPIDFILES=/var/run/chef/server.%s.pid
4+
#PIDFILE=/var/run/chef/server.pid
5+
#CONFIG=/etc/chef/server.rb
6+
#USER=root
7+
#GROUP=root
8+
#CLUSTER_NODES=2
9+
#LOGFILE=/var/log/chef/merb.%s.log
10+
#OPTIONS=

0 commit comments

Comments
 (0)