diff options
Diffstat (limited to 'chef')
-rw-r--r-- | chef/distro/common/man/man1/chef-indexer.1 (renamed from chef/distro/debian/man/man1/chef-indexer.1) | 0 | ||||
-rw-r--r-- | chef/distro/common/man/man1/chef-server.1 (renamed from chef/distro/debian/man/man1/chef-server.1) | 0 | ||||
-rw-r--r-- | chef/distro/common/man/man8/chef-client.8 (renamed from chef/distro/debian/man/man8/chef-client.8) | 0 | ||||
-rw-r--r-- | chef/distro/common/man/man8/chef-solo.8 (renamed from chef/distro/debian/man/man8/chef-solo.8) | 0 | ||||
-rw-r--r-- | chef/distro/redhat/etc/chef/client.rb | 16 | ||||
-rw-r--r-- | chef/distro/redhat/etc/chef/indexer.rb | 10 | ||||
-rw-r--r-- | chef/distro/redhat/etc/chef/server.rb | 22 | ||||
-rw-r--r-- | chef/distro/redhat/etc/init.d/chef-client | 7 | ||||
-rw-r--r-- | chef/distro/redhat/etc/init.d/chef-indexer | 28 | ||||
-rw-r--r-- | chef/distro/redhat/etc/init.d/chef-server | 12 |
10 files changed, 22 insertions, 73 deletions
diff --git a/chef/distro/debian/man/man1/chef-indexer.1 b/chef/distro/common/man/man1/chef-indexer.1 index e6dea91883..e6dea91883 100644 --- a/chef/distro/debian/man/man1/chef-indexer.1 +++ b/chef/distro/common/man/man1/chef-indexer.1 diff --git a/chef/distro/debian/man/man1/chef-server.1 b/chef/distro/common/man/man1/chef-server.1 index fa5eb71d7e..fa5eb71d7e 100644 --- a/chef/distro/debian/man/man1/chef-server.1 +++ b/chef/distro/common/man/man1/chef-server.1 diff --git a/chef/distro/debian/man/man8/chef-client.8 b/chef/distro/common/man/man8/chef-client.8 index b9ebce9a7e..b9ebce9a7e 100644 --- a/chef/distro/debian/man/man8/chef-client.8 +++ b/chef/distro/common/man/man8/chef-client.8 diff --git a/chef/distro/debian/man/man8/chef-solo.8 b/chef/distro/common/man/man8/chef-solo.8 index a2e841715c..a2e841715c 100644 --- a/chef/distro/debian/man/man8/chef-solo.8 +++ b/chef/distro/common/man/man8/chef-solo.8 diff --git a/chef/distro/redhat/etc/chef/client.rb b/chef/distro/redhat/etc/chef/client.rb deleted file mode 100644 index 5be5f35114..0000000000 --- a/chef/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/chef/distro/redhat/etc/chef/indexer.rb b/chef/distro/redhat/etc/chef/indexer.rb deleted file mode 100644 index 1be9c9f0d2..0000000000 --- a/chef/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/chef/distro/redhat/etc/chef/server.rb b/chef/distro/redhat/etc/chef/server.rb deleted file mode 100644 index 6d2a7794e0..0000000000 --- a/chef/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/chef/distro/redhat/etc/init.d/chef-client b/chef/distro/redhat/etc/init.d/chef-client index 332e9606d9..1dc4f204b9 100644 --- a/chef/distro/redhat/etc/init.d/chef-client +++ b/chef/distro/redhat/etc/init.d/chef-client @@ -14,15 +14,14 @@ [ -f /etc/sysconfig/chef-client ] && . /etc/sysconfig/chef-client prog="chef-client" -pidfile=${PIDFILE-/var/run/chef/chef-client.pid} +pidfile=${PIDFILE-/var/run/chef/client.pid} lockfile=${LOCKFILE-/var/lock/subsys/$prog} config=${CONFIG-/etc/chef/client.rb} -logfile=${LOGFILE-/var/log/chef/chef-client.log} -OPTIONS= +options=${OPTIONS--i 1800 -s 20} start() { echo -n "Starting $prog:" - daemon chef-client -d -c "$config" -L "$logfile" "$OPTIONS" ">/dev/null" + daemon chef-client -d -c "$config" "$options" ">/dev/null" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch ${lockfile} diff --git a/chef/distro/redhat/etc/init.d/chef-indexer b/chef/distro/redhat/etc/init.d/chef-indexer index a6375de395..e5e21ef0e5 100644 --- a/chef/distro/redhat/etc/init.d/chef-indexer +++ b/chef/distro/redhat/etc/init.d/chef-indexer @@ -1,39 +1,34 @@ #!/bin/bash -# Startup script for chef-indexer +# 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= +pidfile=/var/run/chef/indexer.pid +lockfile=/var/lock/subsys/$prog +config=/etc/chef/indexer.rb +user="root" +group="root" start() { echo -n "Starting $prog:" - daemon chef-indexer -d -c "$CONFIG" -u "$USER" -g "$GROUP" -L "$LOGFILE" "$OPTIONS" ">/dev/null" + daemon chef-indexer -d -c "$config" -u "$user" -g "$group" -L /var/log/chef/indexer.log "&>/dev/null" RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch ${LOCKFILE} + [ $RETVAL -eq 0 ] && touch ${lockfile} return $RETVAL } stop() { echo -n "Stopping $prog: " - if [ -f $PIDFILE ]; then + if [ -f $pidfile ]; then killproc chef-indexer RETVAL=$? if [ $RETVAL -ne 0 ]; then @@ -43,7 +38,7 @@ stop() { RETVAL=1 failure; fi - rm -f $LOCKFILE + rm -f $lockfile echo return $RETVAL } @@ -60,7 +55,7 @@ case "$1" in start ;; condrestart) - if [ -f $LOCKFILE ]; then + if [ -f $lockfile ]; then stop start fi @@ -74,3 +69,4 @@ case "$1" in esac exit $RETVAL + diff --git a/chef/distro/redhat/etc/init.d/chef-server b/chef/distro/redhat/etc/init.d/chef-server index c8ad5c24d1..a3b40e4a8c 100644 --- a/chef/distro/redhat/etc/init.d/chef-server +++ b/chef/distro/redhat/etc/init.d/chef-server @@ -13,19 +13,21 @@ [ -f /etc/sysconfig/chef-server ] && . /etc/sysconfig/chef-server +# TODO: should be more like chef-client init prog="chef-server" -PIDFILE=/var/run/chef/chef-server.pid +CHILDPIDFILES=/var/run/chef/server.%s.pid +PIDFILE=/var/run/chef/server.main.pid LOCKFILE=/var/lock/subsys/$prog CONFIG=/etc/chef/server.rb -USER="chef" -GROUP="chef" +USER="root" +GROUP="root" CLUSTER_NODES=2 -LOGFILE=/var/log/chef/chef-server-merb.log +LOGFILE=/var/log/chef/merb.%s.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" + daemon chef-server -d -c "$CLUSTER_NODES" -C "$CONFIG" -u "$USER" -G "$GROUP" -L "$LOGFILE" -P "$CHILDPIDFILES" "$OPTIONS" ">/dev/null" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch ${LOCKFILE} |