[DRE-commits] r5815 - trunk/chef/debian
Joshua Timberman
jtimberman-guest at alioth.debian.org
Fri Aug 27 18:56:13 UTC 2010
Author: jtimberman-guest
Date: 2010-08-27 18:56:12 +0000 (Fri, 27 Aug 2010)
New Revision: 5815
Removed:
trunk/chef/debian/chef-client.8
trunk/chef/debian/chef-client.default
trunk/chef/debian/chef-client.init
trunk/chef/debian/chef-server-api.chef-server.default
trunk/chef/debian/chef-server-api.chef-server.init
trunk/chef/debian/chef-server-webui.1
trunk/chef/debian/chef-server-webui.chef-server-webui.default
trunk/chef/debian/chef-server-webui.chef-server-webui.init
trunk/chef/debian/chef-server.1
trunk/chef/debian/chef-solo.8
trunk/chef/debian/chef-solr-indexer.1
trunk/chef/debian/chef-solr-rebuild.8
trunk/chef/debian/chef-solr.1
trunk/chef/debian/chef-solr.chef-solr-indexer.default
trunk/chef/debian/chef-solr.chef-solr-indexer.init
trunk/chef/debian/chef-solr.chef-solr.default
trunk/chef/debian/chef-solr.chef-solr.init
trunk/chef/debian/knife.8
trunk/chef/debian/shef.8
Modified:
trunk/chef/debian/README.Debian
trunk/chef/debian/README.chef-server
trunk/chef/debian/changelog
trunk/chef/debian/control
trunk/chef/debian/rules
Log:
Chef 0.9.8+dfsg-4
Modified: trunk/chef/debian/README.Debian
===================================================================
--- trunk/chef/debian/README.Debian 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/README.Debian 2010-08-27 18:56:12 UTC (rev 5815)
@@ -20,7 +20,7 @@
do this, use the 'chef-solo' command instead of 'chef-client'.
The 'chef-server', 'chef-server-api', 'chef-solr' packages will install a server.
-Chef server is a Merb application slice, and by default the server will start
+Chef server is a Merb application, and by default the server will start
up from an init script as a thin server on port 4000.
Chef server uses CouchDB to store node attribute data and RabbitMQ for an
Modified: trunk/chef/debian/README.chef-server
===================================================================
--- trunk/chef/debian/README.chef-server 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/README.chef-server 2010-08-27 18:56:12 UTC (rev 5815)
@@ -5,7 +5,7 @@
system management with the server is with the command-line tool, knife,
which is provided by the 'chef' package. Chef also has a Web User Interface
(WebUI) that can be used to manage the chef-server through a web browser.
-Both the chef-server-api and chef-server-webui are Merb application slices.
+Both the chef-server-api and chef-server-webui are Merb applications.
For more information about Merb, see its home page.
http://merbivore.com/
@@ -16,13 +16,13 @@
chef-server -a thin -p 4000 -e production
-This uses the 'thin' adapter for the Merb application slice. It runs a Merb
+This uses the 'thin' adapter for the Merb application. It runs a Merb
'master' process that spawns one or more workers (controlled with the -c
parameter to the chef-server command). If only one worker is spawned, the
master process is replaced by the worker.
$ ps awux | grep merb
- root 3005 0.0 1.2 34040 1508 ? S Feb11 0:00 merb : worker (port 4000)
+ chef 1043 0.0 0.8 155820 70508 ? Sl Aug18 2:36 merb : chef-server (api) : worker (port 4000)
Clients connect to the chef-server through the "chef_server_url" value
in the /etc/chef/client.rb config file. The chef-client program can also
Modified: trunk/chef/debian/changelog
===================================================================
--- trunk/chef/debian/changelog 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/changelog 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,3 +1,16 @@
+chef (0.9.8+dfsg-4) unstable; urgency=low
+
+ * debian/rules: use upstream source's init scripts
+
+ -- Joshua Timberman <joshua at opscode.com> Fri, 27 Aug 2010 12:49:58 -0600
+
+chef (0.9.8+dfsg-3) unstable; urgency=low
+
+ * debian/control: remove references to merb slices.
+ * debian/control: chef-server-api and -webui depend on merb-core
+
+ -- Joshua Timberman <joshua at opscode.com> Fri, 20 Aug 2010 15:39:57 -0600
+
chef (0.9.8+dfsg-2) unstable; urgency=low
* Fix stray ) in chef-server init scripts.
Deleted: trunk/chef/debian/chef-client.8
===================================================================
--- trunk/chef/debian/chef-client.8 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-client.8 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,63 +0,0 @@
-.TH CHEF-CLIENT: "8" "August 2009" "chef-client" "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\-V\fR, \fB\-\-verbose\fR
-Ensures logging goes to STDOUT as well as to other configured log location(s).
-.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 at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-client.default
===================================================================
--- trunk/chef/debian/chef-client.default 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-client.default 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,4 +0,0 @@
-LOGFILE=/var/log/chef/client.log
-CONFIG=/etc/chef/client.rb
-INTERVAL=1800
-SPLAY=20
Deleted: trunk/chef/debian/chef-client.init
===================================================================
--- trunk/chef/debian/chef-client.init 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-client.init 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,175 +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 at 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=/usr/bin/chef-client
-NAME=chef-client
-DESC=chef-client
-PIDFILE=/var/run/chef/client.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-if [ ! -d /var/run/chef ]; then
- mkdir /var/run/chef
-fi
-
-DAEMON_OPTS="-L $LOGFILE -d -c $CONFIG -i $INTERVAL -s $SPLAY"
-
-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
-
Deleted: trunk/chef/debian/chef-server-api.chef-server.default
===================================================================
--- trunk/chef/debian/chef-server-api.chef-server.default 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-server-api.chef-server.default 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,6 +0,0 @@
-LOGFILE=/var/log/chef/server.log
-CONFIG=/etc/chef/server.rb
-ADAPTER=thin
-PORT=4000
-USER=chef
-GROUP=chef
Deleted: trunk/chef/debian/chef-server-api.chef-server.init
===================================================================
--- trunk/chef/debian/chef-server-api.chef-server.init 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-server-api.chef-server.init 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,120 +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 at 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=/usr/sbin/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 0
-
-. /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 : chef-server.*api.*$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
- 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
-
Deleted: trunk/chef/debian/chef-server-webui.1
===================================================================
--- trunk/chef/debian/chef-server-webui.1 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-server-webui.1 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,106 +0,0 @@
-.TH CHEF-SERVER-WEBUI "1" "March 2010" "chef-server-webui" "User Commands"
-.SH NAME
-chef-server-webui \- Start the Chef Server merb application slice providing Web User Interface.
-.SH SYNOPSIS
-.B chef-server-webui
-[\fIuGdcIpPhmailLerkKX\fR] [\fIargument\fR]
-.SH DESCRIPTION
-The Chef Server WebUI is a Merb application slice. The default listen port is 4040.
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-This flag is for having chef-server-webui 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-webui 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-webui 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-webui.
-.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-webui on, defaults to 4040. Additional nodes (\-c) listen on incrementing port numbers.
-.TP
-\fB\-o\fR, \fB\-\-socket\-file\fR FILE
-Socket file to run chef-server-webui 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-webui 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-webui 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-webui (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-webui 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-webui app.
-.TP
-\fB\-K\fR, \fB\-\-graceful\fR PORT or all
-Gracefully kill chef-server-webui 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-webui 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-webui is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-server-webui.chef-server-webui.default
===================================================================
--- trunk/chef/debian/chef-server-webui.chef-server-webui.default 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-server-webui.chef-server-webui.default 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,6 +0,0 @@
-LOGFILE=/var/log/chef/server-webui.log
-CONFIG=/etc/chef/webui.rb
-ADAPTER=thin
-PORT=4040
-USER=chef
-GROUP=chef
Deleted: trunk/chef/debian/chef-server-webui.chef-server-webui.init
===================================================================
--- trunk/chef/debian/chef-server-webui.chef-server-webui.init 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-server-webui.chef-server-webui.init 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,121 +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 at 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=/usr/sbin/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 0
-
-. /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 : chef-server-webui.*$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
- 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
-
Deleted: trunk/chef/debian/chef-server.1
===================================================================
--- trunk/chef/debian/chef-server.1 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-server.1 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,107 +0,0 @@
-.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 at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-solo.8
===================================================================
--- trunk/chef/debian/chef-solo.8 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solo.8 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,57 +0,0 @@
-.TH CHEF-SOLO: "8" "August 2009" "chef-solo" "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 at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-solr-indexer.1
===================================================================
--- trunk/chef/debian/chef-solr-indexer.1 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr-indexer.1 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,55 +0,0 @@
-.TH CHEF-SOLR-INDEXER: "1" "March 2010" "chef-solr-indexer" "User Commands"
-.SH NAME
-chef-solr-indexer: \- manual page for chef-solr-indexer
-.SH SYNOPSIS
-.B chef-solr-indexer
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-\fB\-\-amqp\-host\fR HOST
-The amqp host
-.TP
-\fB\-\-amqp\-pass\fR PASS
-The amqp password
-.TP
-\fB\-\-amqp\-port\fR PORT
-The amqp port
-.TP
-\fB\-\-amqp\-user\fR USER
-The amqp user
-.TP
-\fB\-\-amqp\-vhost\fR VHOST
-The amqp vhost
-.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\-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 set privilege to
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef\-solr\-indexer version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-solr is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-chef-solr-indexer was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-solr-rebuild.8
===================================================================
--- trunk/chef/debian/chef-solr-rebuild.8 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr-rebuild.8 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,37 +0,0 @@
-.TH CHEF-SOLR-REBUILD: "1" "March 2010" "chef-solr-rebuild" "User Commands"
-.SH NAME
-chef-solr-rebuild: \- manual page for chef-solr-rebuild
-.SH SYNOPSIS
-.B chef-solr-rebuild
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-d\fR, \fB\-\-couchdb\-database\fR DB
-The CouchDB Database to re\-index
-.TP
-\fB\-u\fR, \fB\-\-couchdb\-url\fR URL
-The CouchDB URL
-.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\-v\fR, \fB\-\-version\fR
-Show chef\-solr\-rebuild version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-solr is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-chef-solr-rebuild was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-solr.1
===================================================================
--- trunk/chef/debian/chef-solr.1 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr.1 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,55 +0,0 @@
-.TH CHEF-SOLR: "1" "March 2010" "chef-solr" "User Commands"
-.SH NAME
-chef-solr: \- manual page for chef-solr
-.SH SYNOPSIS
-.B chef-solr
-\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\-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\-D\fR, \fB\-\-solr\-data\-dir\fR PATH
-Where the Solr data lives
-.TP
-\fB\-x\fR, \fB\-\-solor\-heap\-size\fR SIZE
-Set the size of the Java Heap
-.TP
-\fB\-H\fR, \fB\-\-solr\-home\-dir\fR PATH
-Solr home directory
-.TP
-\fB\-j\fR, \fB\-\-java\-opts\fR OPTS
-Raw options passed to Java
-.TP
-\fB\-W\fR, \fB\-\-solr\-jetty\-dir\fR PATH
-Where to place the Solr Jetty instance
-.TP
-\fB\-u\fR, \fB\-\-user\fR USER
-User to set privilege to
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef\-solr version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-Full documentation for Chef and chef-solr is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.SH AUTHOR
-chef-solr was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at 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.
Deleted: trunk/chef/debian/chef-solr.chef-solr-indexer.default
===================================================================
--- trunk/chef/debian/chef-solr.chef-solr-indexer.default 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr.chef-solr-indexer.default 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,4 +0,0 @@
-LOGFILE=/var/log/chef/solr-indexer.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
Deleted: trunk/chef/debian/chef-solr.chef-solr-indexer.init
===================================================================
--- trunk/chef/debian/chef-solr.chef-solr-indexer.init 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr.chef-solr-indexer.init 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,176 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: chef-solr-indexer
-# 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.
-### END INIT INFO
-#
-# Copyright (c) 2009-2010 Opscode, Inc <legal at opscode.com>
-#
-# chef-solr-indexer Startup script for chef-solr-indexer.
-# chkconfig: - 85 02
-# description: starts up chef-solr-indexer in daemon mode.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/chef-solr-indexer
-NAME=chef-solr-indexer
-DESC=chef-solr-indexer
-PIDFILE=/var/run/chef/solr-indexer.pid
-
-test -x $DAEMON || exit 0
-
-. /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 -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' | 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
-
Deleted: trunk/chef/debian/chef-solr.chef-solr.default
===================================================================
--- trunk/chef/debian/chef-solr.chef-solr.default 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr.chef-solr.default 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,4 +0,0 @@
-LOGFILE=/var/log/chef/solr.log
-CONFIG=/etc/chef/solr.rb
-USER=chef
-GROUP=chef
Deleted: trunk/chef/debian/chef-solr.chef-solr.init
===================================================================
--- trunk/chef/debian/chef-solr.chef-solr.init 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/chef-solr.chef-solr.init 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,177 +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 at 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=/usr/sbin/chef-solr
-DAEMON_NAME=java
-NAME=chef-solr
-DESC=chef-solr
-PIDFILE=/var/run/chef/solr.pid
-
-test -x $DAEMON || exit 0
-
-. /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 -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() {
- 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
-
Modified: trunk/chef/debian/control
===================================================================
--- trunk/chef/debian/control 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/control 2010-08-27 18:56:12 UTC (rev 5815)
@@ -60,11 +60,11 @@
Package: chef-server-api
Architecture: all
-Depends: ${misc:Depends}, ruby, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, rabbitmq-server (>= 1.6), couchdb (>= 0.9.1), thin, libjson-ruby, libchef-ruby (= ${source:Version}), chef-solr (= ${source:Version}), adduser, ucf
+Depends: ${misc:Depends}, ruby, merb-core, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, rabbitmq-server (>= 1.6), couchdb (>= 0.9.1), thin, libjson-ruby, libchef-ruby (= ${source:Version}), chef-solr (= ${source:Version}), adduser, ucf
Recommends: chef (= ${source:Version})
Replaces: chef-server-slice
Conflicts: chef-server-slice
-Description: Merb slice providing REST API for Chef client access
+Description: Merb application providing REST API for Chef client access
Chef is a systems integration framework and configuration management library
written in Ruby. Chef provides a Ruby library and API that can be used to
bring the benefits of configuration management to an entire infrastructure.
@@ -76,14 +76,14 @@
The chef-server-api package provides the API for the Chef Server so
clients can connect and is started with the chef-server program.
.
- This package contains the Merb slice for the chef-server-api.
+ This package contains the Merb application for the chef-server-api.
Package: chef-server-webui
Architecture: all
-Depends: ${misc:Depends}, ruby, merb-slices, libmerb-param-protection-ruby, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, thin, libopenid-ruby, libjson-ruby, libchef-ruby (= ${source:Version}), libcoderay-ruby, chef-server (= ${source:Version}), adduser, libjs-jquery-ui (>= 1.7.1), ucf
+Depends: ${misc:Depends}, ruby, merb-core, libmerb-param-protection-ruby, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, thin, libopenid-ruby, libjson-ruby, libchef-ruby (= ${source:Version}), libcoderay-ruby, chef-server (= ${source:Version}), adduser, libjs-jquery-ui (>= 1.7.1), ucf
Suggests: chef (= ${source:Version}), apache2, nginx
Conflicts: chef-server-slice
-Description: Merb app slice providing Web interface to API server for Chef
+Description: Merb application providing Web interface to API server for Chef
Chef is a systems integration framework and configuration management library
written in Ruby. Chef provides a Ruby library and API that can be used to
bring the benefits of configuration management to an entire infrastructure.
@@ -92,7 +92,7 @@
directly to provide an easy to use interface for managing Chef clients and
Chef server data.
.
- This package contains the Merb slice and assets for the chef-server-webui.
+ This package contains the Merb app and assets for the chef-server-webui.
Package: libchef-ruby
Architecture: all
Deleted: trunk/chef/debian/knife.8
===================================================================
--- trunk/chef/debian/knife.8 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/knife.8 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,359 +0,0 @@
-.TH CHEF: "1" "December 2009" "knife: 0.8.0" "System Administration Utilities"
-.SH NAME
-knife: \- Chef server REST API utility
-.SH SYNOPSIS
-.B knife
-\fIsub-command (options)\fR
-.SH DESCRIPTION
-.TP
-This manual page documents knife, a command-line utility used to interact with a Chef server directly through the RESTful API. Knife uses sub-commands to take various actions on different types of Chef objects. Some sub-commands take additional options. General options follow sub-commands and their options. A configuration file can be created for common defaults.
-.TP
-Unless otherwise specified, output is in JSON format, and input files are also JSON format.
-.SH GENERAL OPTIONS
-.TP
-\fB\-s\fR, \fB\-\-server\-url\fR URL
-Chef Server URL
-.TP
-\fB\-k\fR, \fB\-\-key\fR KEY
-API Client Key
-.TP
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-e\fR, \fB\-\-editor\fR EDITOR
-Set the editor to use for interactive commands
-.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\-u\fR, \fB\-\-user\fR USER
-API Client Username
-.TP
-\fB\-p\fR, \fB\-\-print\-after\fR
-Show the data after a destructive operation
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef version
-.TP
-\fB\-y\fR, \fB\-\-yes\fR
-Say yes to all prompts for confirmation
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show usage information.
-.SH SUB-COMMANDS
-Knife sub-commands are structured as "NOUN verb NOUN (options)". The sub-commands are meant to be intuitively named.
-.SH CLIENT SUB-COMMANDS
-.TP
-Sub-commands related to working with clients, which are registered entities that access the Chef server.
-.TP
-.B client bulk delete \fI(options)\fR
-.TP
-\fB\-r\fR, \fB\-\-regex\fR [REGEX]
-Narrow the operation via regular expression
-.PP
-Delete all the clients on the Chef server, or only certain clients based on a regular expression.
-.PP
-.B client create CLIENT (options)
-.TP
-\fB\-f\fR, \fB\-\-file\fR FILE
-Write the key to a file
-.PP
-Create a new client.
-.PP
-.B client delete CLIENT (options)
-.PP
-Deletes a registered client.
-.PP
-.B client edit CLIENT (options)
-.PP
-Edit a registered client.
-.PP
-.B client list (options)
-.TP
-\fB\-w\fR, \fB\-\-with\-uri\fR
-Show corresponding URIs
-.PP
-List all registered clients.
-.PP
-.B client reregister CLIENT (options)
-.TP
-\fB\-f\fR, \fB\-\-file\fR FILE
-Write the key to a file
-.PP
-Regenerate the private key for a client.
-.PP
-.B client show CLIENT (options)
-.TP
-\fB\-a\fR, \fB\-\-attribute\fR [ATTR]
-Show only one attribute
-.PP
-Show a client.
-.SH COOKBOOK SUB-COMMANDS
-.TP
-Cookbooks are the fundamental unit of distribution in Chef. They encapsulate all the recipes of resources and the assets used to configure a particular aspect of the infrastructure.
-.PP
-.B cookbook bulk delete COOKBOOK (options)
-.TP
-\fB\-r\fR, \fB\-\-regex\fR [REGEX]
-Narrow the operation via regular expression
-.PP
-Delete all the cookbooks on the Chef server, or use a regular expression to only delete certain cookbooks.
-.PP
-.B cookbook delete COOKBOOK (options)
-.PP
-Delete a single named COOKBOOK.
-.PP
-.B cookbook download COOKBOOK (options)
-.TP
-\fB\-f\fR, \fB\-\-file\fR FILE
-The filename to write to
-.PP
-Download a cookbook from the server as a gzip(1)'ed, tar(1) archive.
-.PP
-.B cookbook list (options)
-.TP
-\fB\-w\fR, \fB\-\-with\-uri\fR
-Show corresponding URIs
-.PP
-List all cookbooks.
-.PP
-.B cookbook metadata COOKBOOK (options)
-.TP
-\fB\-a\fR, \fB\-\-all\fR
-Generate metadata for all cookbooks, rather than just a single cookbook
-.PP
-Generate cookbook metadata for the named COOKBOOK.
-.TP
-\fB\-o\fR, \fB\-\-cookbook\-path\fR PATH:PATH
-A colon\-separated path to look for cookbooks in
-.PP
-.B cookbook show COOKBOOK [PART] [FILENAME] (options)
-.TP
-\fB\-f\fR, \fB\-\-fqdn\fR FQDN
-The FQDN of the host to see the file for
-.TP
-\fB\-p\fR, \fB\-\-platform\fR PLATFORM
-The platform to see the file for
-.TP
-\fB\-V\fR, \fB\-\-platform\-version\fR VERSION
-The platform version to see the file for
-.PP
-Show the particular part of a COOKBOOK. PART can be one of:
-.TP
-\fIattribute definition file provider recipe resource template\fR
-.PP
-.B cookbook upload COOKBOOK (options)
-.TP
-\fB\-a\fR, \fB\-\-all\fR
-Upload all cookbooks, rather than just a single cookbook
-.TP
-\fB\-o\fR, \fB\-\-cookbook\-path\fR PATH:PATH
-A colon\-separated path to look for cookbooks in
-.PP
-Upload a cookbook to the server.
-.SH DATA BAG SUB-COMMANDS
-.PP
-Data bags are stores of JSON blobs. These blobs are called items. They are free form and indexed by the search mechanism on the Chef server.
-.PP
-.B data bag create BAG [ITEM] (options)
-.PP
-Create a new data bag, or item in a data bag.
-.PP
-.B data bag delete BAG [ITEM] (options)
-.PP
-Delete a data bag, or item from a data bag.
-.PP
-.B data bag edit BAG ITEM (options)
-.PP
-Edit an item in a data bag.
-.PP
-.B data bag list (options)
-.TP
-\fB\-w\fR, \fB\-\-with\-uri\fR
-Show corresponding URIs
-.PP
-List the available data bags.
-.PP
-.B data bag show BAG [ITEM] (options)
-.PP
-Show a specific data bag or an item in a data bag.
-.SH NODE SUB-COMMANDS
-.PP
-Nodes are the entities which are configured with Chef, typically servers or workstations. Nodes are registered as a client, typcially of the same name, but a single client might represent one or more nodes.
-.PP
-.B node bulk delete (options)
-.TP
-\fB\-r\fR, \fB\-\-regex\fR [REGEX]
-Narrow the operation via regular expression
-.PP
-Delete all nodes, or only certain nodes based on a regular expression.
-.PP
-.B node create NODE (options)
-.PP
-Create a new node.
-.PP
-.B node delete NODE (options)
-.PP
-Delete a single node.
-.PP
-.B node edit NODE (options)
-.PP
-Edit a node.
-.PP
-.B node from file FILE (options)
-.PP
-Create a node from a JSON file.
-.PP
-.B node list (options)
-.TP
-\fB\-w\fR, \fB\-\-with\-uri\fR
-Show corresponding URIs
-.PP
-List all nodes.
-.PP
-.B node run_list add [NODE] [ENTRY] (options)
-.TP
-\fB\-a\fR, \fB\-\-after\fR [ITEM]
-Place the ENTRY in the run list after ITEM
-.PP
-Add a recipe or role to the node's run_list.
-.PP
-.B node run_list remove [NODE] [ENTRY] (options)
-.PP
-Remove a recipe or role from the node's run_list.
-.PP
-.B node show NODE (options)
-.TP
-\fB\-a\fR, \fB\-\-attribute\fR [ATTR]
-Show only one attribute
-.TP
-\fB\-r\fR, \fB\-\-run\-list\fR
-Show only the run list
-.PP
-Show a node.
-.SH ROLE SUB-COMMANDS
-.PP
-Roles provide a mechanism to apply a set of recipes and attributes to nodes. For example, the 'webserver' role might instruct Chef to add a recipe for Apache, and specify a default domain to use.
-.PP
-.B role bulk delete (options)
-.TP
-\fB\-r\fR, \fB\-\-regex\fR [REGEX]
-Narrow the operation via regular expression
-.PP
-Delete all roles, or only certain roles based on a regular expression.
-.PP
-.B role create ROLE (options)
-.TP
-\fB\-d\fR, \fB\-\-description\fR
-The role description
-.PP
-Create a new role.
-.PP
-.B role delete ROLE (options)
-.PP
-Delete a role.
-.PP
-.B role edit ROLE (options)
-Edit a role.
-.PP
-.B role from file FILE (options)
-.PP
-Update a role from a file.
-.PP
-.B role list (options)
-.TP
-\fB\-w\fR, \fB\-\-with\-uri\fR
-Show corresponding URIs
-.PP
-List roles.
-.PP
-.B role show ROLE (options)
-.TP
-\fB\-a\fR, \fB\-\-attribute\fR [ATTR]
-Show only one attribute
-.PP
-Show a specific role.
-.SH GENERAL SUB-COMMANDS
-.PP
-The following are general sub-commands that do not fit within the other object types used in Chef.
-.PP
-.B configure (options)
-.TP
-\fB\-r\fR, \fB\-\-repository\fR REPO
-The path to your chef\-repo
-.PP
-Create a configuration file for knife. This will prompt for values to enter into the file. See "\fBCONFIGURATION\fR" below for available options.
-.PP
-.B ec2 instance data [RUN LIST...] (options)
-.TP
-\fB\-e\fR, \fB\-\-edit\fR
-Edit the instance data
-.PP
-Chef is commonly used with Amazon AWS EC2 nodes. This command will generate instance metadata that can be used to automatically configure an EC2 instance with Chef.
-.PP
-.B search INDEX QUERY (options)
-.TP
-\fB\-a\fR, \fB\-\-attribute\fR [ATTR]
-Show only one attribute
-.TP
-\fB\-i\fR, \fB\-\-id\-only\fR
-Show only the ID of matching objects
-.TP
-\fB\-R\fR, \fB\-\-rows\fR INT
-The number of rows to return
-.TP
-\fB\-r\fR, \fB\-\-run\-list\fR
-Show only the run list
-.TP
-\fB\-o\fR, \fB\-\-sort\fR SORT
-The order to sort the results in
-.TP
-\fB\-b\fR, \fB\-\-start\fR ROW
-The row to start returning results at
-.PP
-Search indexes are a powerful feature of the Chef server and the search subcommand allows searching any of the available indexes using the SOLR query syntax.
-.SH CONFIGURATION
-The knife configuration file is a Ruby DSL. If it exists, knife uses the settings for \fBGENERAL OPTIONS\fR defaults.
-.TP
-.B log_level
-A Ruby symbol specifying the log level. Corresponds to the \-l or \-\-log_level option. Default is :info.
-.TP
-.B log_location
-Corresponds to the \-L or \-\-logfile option. Default is STDOUT.
-.TP
-.B node_name
-User to authenticate to the Chef server. Corresponds to the \-u or \-\-user option. This is requested from the user when running this sub-command.
-.TP
-.B client_key
-Private key file to authenticate to the Chef server. Corresponds to the \-k or \-\-key option. This is requested from the user when running this sub-command.
-.TP
-.B chef_server_url
-URL of the Chef server. Corresponds to the \-s or \-\-server\-url option. This is requested from the user when running this sub-command.
-.TP
-.B cache_type
-The type of cache to use. Default is \fIBasicFile\fR. This can be any type of Cache that moneta supports: BasicFile, Berkeley, Couch, DataMapper, File, LMC, Memcache, Memory, MongoDB, Redis, Rufus, S3, SDBM, Tyrant, Xattr, YAML.
-.TP
-.B cache_options
-Specifies various options to use for caching. Default reads the Chef client configuration (/etc/chef/checksums).
-.SH FILES
-.PP
-\fI~/.chef/knife.rb\fR
-.TP
-Ruby DSL configuration file for Knife. See "\fBCONFIGURATION\fR".
-.SH SEE ALSO
-.PP
-Full documentation for Chef and Knife is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.
-.PP
-JSON is JavaScript Object Notation and more information can be found at http://json.org/.
-.PP
-SOLR is an open source search engine. The Chef Server includes a SOLR installation. More information about SOLR, including search query syntax, can be found at http://lucene.apache.org/solr/.
-.SH AUTHOR
-Chef was written by Adam Jacob <adam at ospcode.com> of Opscode (http://www.opscode.com), with contributions from the community.
-This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man. Permission is granted
-to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-.PP
-On Debian systems, the complete text of the Apache 2.0 License can be found in
-/usr/share/common-licenses/Apache-2.0.
Modified: trunk/chef/debian/rules
===================================================================
--- trunk/chef/debian/rules 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/rules 2010-08-27 18:56:12 UTC (rev 5815)
@@ -34,6 +34,8 @@
install/chef::
# init script name is different from the package:
+ cp -f $(CURDIR)/chef/distro/debian/etc/init.d/chef-client $(CURDIR)/debian/chef-client.init
+ cp -f $(CURDIR)/chef/distro/debian/etc/default/chef-client $(CURDIR)/debian/chef-client.default
dh_installinit --name chef-client -- defaults 99 02
cp -rf $(CURDIR)/debian/etc/chef/client.rb $(CURDIR)/debian/chef/usr/share/chef
cp -rf $(CURDIR)/debian/etc/chef/solo.rb $(CURDIR)/debian/chef/usr/share/chef
@@ -52,6 +54,10 @@
rmdir $(CURDIR)/debian/libchef-ruby1.8/usr/bin/
install/chef-solr::
+ cp -f $(CURDIR)/chef/distro/debian/etc/default/chef-solr $(CURDIR)/debian/chef-solr.chef-solr.default
+ cp -f $(CURDIR)/chef/distro/debian/etc/default/chef-solr-indexer $(CURDIR)/debian/chef-solr.chef-solr-indexer.default
+ cp -f $(CURDIR)/chef/distro/debian/etc/init.d/chef-solr $(CURDIR)/debian/chef-solr.chef-solr.init
+ cp -f $(CURDIR)/chef/distro/debian/etc/init.d/chef-solr-indexer $(CURDIR)/debian/chef-solr.chef-solr-indexer.init
cp -rf $(CURDIR)/debian/etc/chef/solr.rb debian/chef-solr/usr/share/chef-solr
cp -rf $(CURDIR)/debian/etc/chef/solr-jetty debian/chef-solr/etc/chef
cp chef-solr/bin/chef-solr-indexer debian/chef-solr/usr/sbin
@@ -64,6 +70,8 @@
dh_installlogrotate --name=chef-solr-indexer
install/chef-server-api::
+ cp -f $(CURDIR)/chef/distro/debian/etc/default/chef-server $(CURDIR)/debian/chef-server-api.chef-server.default
+ cp -f $(CURDIR)/chef/distro/debian/etc/init.d/chef-server $(CURDIR)/debian/chef-server-api.chef-server.init
mkdir -p $(CURDIR)/debian/chef-server-api/usr/sbin
mkdir -p $(CURDIR)/debian/chef-server-api/usr/share/chef-server-api
mkdir -p $(CURDIR)/debian/chef-server-api/usr/share/doc/chef-server-api
@@ -78,6 +86,8 @@
dh_installinit --name=chef-server -- defaults 90 02
install/chef-server-webui::
+ cp -f $(CURDIR)/chef/distro/debian/etc/default/chef-server-webui $(CURDIR)/debian/chef-server-webui.chef-server-webui.default
+ cp -f $(CURDIR)/chef/distro/debian/etc/init.d/chef-server-webui $(CURDIR)/debian/chef-server-webui.chef-server-webui.init
mkdir -p $(CURDIR)/debian/chef-server-webui/usr/sbin
cp debian/etc/chef/webui.rb debian/chef-server-webui/usr/share/chef-server-webui
cp chef-server-webui/bin/chef-server-webui debian/chef-server-webui/usr/sbin
Deleted: trunk/chef/debian/shef.8
===================================================================
--- trunk/chef/debian/shef.8 2010-08-27 09:26:14 UTC (rev 5814)
+++ trunk/chef/debian/shef.8 2010-08-27 18:56:12 UTC (rev 5815)
@@ -1,45 +0,0 @@
-.TH SHEF: "8" "March 2010" "Chef: 0.8.4" "System Administration Utilities"
-.SH NAME
-shef: \- Run Chef in an IRB session.
-.SH SYNOPSIS
-.B shef
-\fI(options)\fR
-.SH DESCRIPTION
-.TP
-This manual page documents shef, a command-line REPL console used to run Chef in an IRB session. It includes recipe and attribute file syntax, and interactive debugging features.
-\fB\-S\fR, \fB\-\-server\fR CHEFSERVERURL
-The chef server URL
-.TP
-\fB\-z\fR, \fB\-\-client\fR
-chef\-client shef session
-.TP
-\fB\-c\fR, \fB\-\-config\fR CONFIG
-The configuration file to use
-.TP
-\fB\-j\fR JSON_ATTRIBS
-Load attributes from a JSON file or URL
-.HP
-\fB\-\-json\-attributes\fR
-.TP
-\fB\-s\fR, \fB\-\-solo\fR
-chef\-solo shef session
-.TP
-\fB\-a\fR, \fB\-\-standalone\fR
-standalone shef session
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show chef version
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.SH "SEE ALSO"
-The full documentation for
-.B shef
-is maintained on the Chef wiki, http://wiki.opscode.com/display/chef/Shef/.
-.SH AUTHOR
-Shef was written by Daniel DeLeo <dan at kallistec.com> as part of Chef, by Opscode, Inc.
-This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man. Permission is granted
-to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
-.PP
-On Debian systems, the complete text of the Apache 2.0 License can be found in
-/usr/share/common-licenses/Apache-2.0.
More information about the Pkg-ruby-extras-commits
mailing list