[DRE-commits] r3879 - in packages-wip/chef/trunk: . debian debian/etc debian/etc/chef debian/patches

Joshua Timberman jtimberman-guest at alioth.debian.org
Fri Aug 7 00:29:52 UTC 2009


Author: jtimberman-guest
Date: 2009-08-07 00:29:52 +0000 (Fri, 07 Aug 2009)
New Revision: 3879

Added:
   packages-wip/chef/trunk/debian/
   packages-wip/chef/trunk/debian/README.Debian
   packages-wip/chef/trunk/debian/README.chef-server
   packages-wip/chef/trunk/debian/changelog
   packages-wip/chef/trunk/debian/chef-client.8
   packages-wip/chef/trunk/debian/chef-client.init
   packages-wip/chef/trunk/debian/chef-indexer.1
   packages-wip/chef/trunk/debian/chef-indexer.dirs
   packages-wip/chef/trunk/debian/chef-indexer.init
   packages-wip/chef/trunk/debian/chef-indexer.manpages
   packages-wip/chef/trunk/debian/chef-server-slice.dirs
   packages-wip/chef/trunk/debian/chef-server.1
   packages-wip/chef/trunk/debian/chef-server.dirs
   packages-wip/chef/trunk/debian/chef-server.init
   packages-wip/chef/trunk/debian/chef-server.manpages
   packages-wip/chef/trunk/debian/chef-solo.8
   packages-wip/chef/trunk/debian/chef.dirs
   packages-wip/chef/trunk/debian/chef.manpages
   packages-wip/chef/trunk/debian/compat
   packages-wip/chef/trunk/debian/control
   packages-wip/chef/trunk/debian/copyright
   packages-wip/chef/trunk/debian/etc/
   packages-wip/chef/trunk/debian/etc/chef/
   packages-wip/chef/trunk/debian/etc/chef/client.rb
   packages-wip/chef/trunk/debian/etc/chef/indexer.rb
   packages-wip/chef/trunk/debian/etc/chef/server.rb
   packages-wip/chef/trunk/debian/etc/chef/solo.rb
   packages-wip/chef/trunk/debian/patches/
   packages-wip/chef/trunk/debian/patches/fix_slice_dirs.patch
   packages-wip/chef/trunk/debian/patches/remove_rubygems.patch
   packages-wip/chef/trunk/debian/patches/series
   packages-wip/chef/trunk/debian/rules
   packages-wip/chef/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: packages-wip/chef/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages-wip/chef/trunk/debian/README.Debian
===================================================================
--- packages-wip/chef/trunk/debian/README.Debian	                        (rev 0)
+++ packages-wip/chef/trunk/debian/README.Debian	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,49 @@
+chef packages for Debian
+------------------------
+
+While Chef is in production use at several companies managing a variety 
+of infrastructure types and sizes, it is still a young product (7 months old as
+of this writing) and under active development. Please see the Chef Wiki for
+information on components that may be changed, or find out how you can 
+improve Chef by contributing.
+
+Chef is normally distributed as a RubyGem, and gets its dependencies through
+RubyGems. These packages are independent of RubyGems. All dependencies are 
+handled like other normal Debian packages.
+
+The 'chef' package will install a client that can run with a server via the
+'chef-client' command. The client configuration file needs to be modified 
+to point at the appropriate server.
+
+  /etc/chef/client.rb
+
+  registration_url "http://chef.example.com"
+  openid_url       "http://chef.example.com:444"
+  template_url     "http://chef.example.com"
+  remotefile_url   "http://chef.example.com"
+  search_url       "http://chef.example.com"
+
+Chef can be run in 'solo' mode though, which does not connect to a server. To
+do this, use the 'chef-solo' command instead of 'chef-client'.
+  
+The 'chef-server' and 'chef-server-slice' packages will install a server. Chef
+server is a Merb application slice, and by default this is set up to run under 
+Apache as Passenger application. Chef server uses CouchDB to store node attribute 
+data.
+
+Additional Resources
+--------------------
+
+The official documentation for Chef is on the Opscode wiki:
+
+  http://wiki.opscode.com/display/chef/Home
+
+Opscode also hosts mailing lists:
+
+  http://lists.opscode.com/
+
+And there's an IRC channel on Freenode:
+
+  irc://irc.freenode.net/chef
+
+ -- Joshua Timberman <joshua at opscode.com>  Mon, 03 Aug 2009 22:14:03 -0600

Added: packages-wip/chef/trunk/debian/README.chef-server
===================================================================
--- packages-wip/chef/trunk/debian/README.chef-server	                        (rev 0)
+++ packages-wip/chef/trunk/debian/README.chef-server	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,58 @@
+chef-server for Debian
+----------------------
+
+There are a number of ways to set up the chef-server. The default on Debian is
+to use Passenger (mod_rack) under Apache2.
+
+Here are the steps you'll need to take to finish setting up the chef-server
+merb application on your local system. (# denotes a root prompt, use sudo
+if appropriate for your system.)
+
+1. The package installation will generate a self-signed SSL certificate so
+the chef-server can be accessed via HTTPS. If you would like to use a 
+different certificate, you can copy the .pem file to /etc/chef/certificates.
+
+Make note of the filename, we'll need it shortly.
+
+2. Edit /etc/chef/apache.conf.
+
+	# vi /etc/chef/apache.conf
+
+3. Modify the line ServerName to match your system's fully qualified
+domain name (FQDN). To get the FQDN:
+
+	$ hostname -f
+	localhost.localdomain
+
+Your hostname may vary. This needs to be changed in both 
+VirtualHosts (*:443, *:444).
+
+4. Update the directives SSLCertificateFile, SSLCertificateKeyFile. If
+you're using the generated SSL certificate, this will be named after the
+FQDN, so using the above example:
+	
+  "/etc/chef/certificates/localhost.localdomain.pem"
+
+If you're using a different certificate, you'll need to change the values
+to match.
+
+5. Restart the Apache web server for the changes to take effect.
+
+  /etc/init.d/apache2 restart
+
+Additional Resources
+--------------------
+
+The official documentation for Chef is on the Opscode wiki:
+
+  http://wiki.opscode.com/display/chef/Home
+
+Opscode also hosts mailing lists:
+
+  http://lists.opscode.com/
+
+And there's an IRC channel on Freenode:
+
+  irc://irc.freenode.net/chef
+
+ -- Joshua Timberman <joshua at opscode.com>  Mon, 03 Aug 2009 22:14:03 -0600

Added: packages-wip/chef/trunk/debian/changelog
===================================================================
--- packages-wip/chef/trunk/debian/changelog	                        (rev 0)
+++ packages-wip/chef/trunk/debian/changelog	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,5 @@
+chef (0.7.4-1) unstable; urgency=low
+
+   * Initial release (Closes: #529392)
+
+ -- Joshua Timberman <joshua at opscode.com>  Thu, 30 Jul 2009 21:06:25 -0600

Added: packages-wip/chef/trunk/debian/chef-client.8
===================================================================
--- packages-wip/chef/trunk/debian/chef-client.8	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-client.8	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,57 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH CHEF-CLIENT: "8" "July 2009" "chef-client 0.7.4" "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\-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

Added: packages-wip/chef/trunk/debian/chef-client.init
===================================================================
--- packages-wip/chef/trunk/debian/chef-client.init	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-client.init	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,175 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-client
+# Required-Start:     $network
+# Required-Stop:      $network
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a chef-client.
+### END INIT INFO
+#
+# Copyright (c) 2009 Joshua Timberman, <joshua at opscode.com>
+#
+# chef-client         Startup script for chef-client.
+# chkconfig: - 98 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
+LOGDIR=/var/log/chef
+CONFIG=/etc/chef/client.rb
+PIDFILE=/var/run/chef/client.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+if [ ! -d /var/run/chef ]; then
+  mkdir /var/run/chef
+fi
+
+DAEMON_OPTS="-d -c $CONFIG -i 1800 -s 20"
+
+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                           
+  kill -1 $pid
+  return $?
+}   
+
+force_stop() {
+  [ ! -e "$PIDFILE" ] && return
+  if running ; then
+    kill -15 $pid
+    sleep "$DIETIME"s
+    if running ; then
+      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 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
+

Added: packages-wip/chef/trunk/debian/chef-indexer.1
===================================================================
--- packages-wip/chef/trunk/debian/chef-indexer.1	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-indexer.1	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,38 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH CHEF-INDEXER: "1" "July 2009" "chef-indexer 0.7.4" "User Commands"
+.SH NAME
+chef-indexer: \- Runs the search index process.
+.SH SYNOPSIS
+.B chef-indexer
+\fI(options)\fR
+.SH DESCRIPTION
+.TP
+chef-indexer requires that the stompserver be started but at this time the stompserver package does not install a startup script, let alone start the daemon. I am working with the package maintainer for stompserver to include a startup script.
+\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 change gid to before daemonizing
+.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 change uid to before daemonizing
+.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-indexer 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

Added: packages-wip/chef/trunk/debian/chef-indexer.dirs
===================================================================
--- packages-wip/chef/trunk/debian/chef-indexer.dirs	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-indexer.dirs	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,5 @@
+var/lib/chef/search_index
+var/log/chef
+usr/bin
+etc/chef
+etc/init.d

Added: packages-wip/chef/trunk/debian/chef-indexer.init
===================================================================
--- packages-wip/chef/trunk/debian/chef-indexer.init	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-indexer.init	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,175 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-indexer
+# Required-Start:     $network
+# Required-Stop:      $network
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a chef-indexer.
+### END INIT INFO
+#
+# Copyright (c) 2009 Joshua Timberman, <joshua at opscode.com>
+#
+# chef-indexer         Startup script for chef-indexer.
+# chkconfig: - 98 02
+# description: starts up chef-indexer in daemon mode.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/chef-indexer
+NAME=chef-indexer
+DESC=chef-indexer
+LOGDIR=/var/log/chef
+CONFIG=/etc/chef/indexer.rb
+PIDFILE=/var/run/chef/indexer.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+if [ ! -d /var/run/chef ]; then
+  mkdir /var/run/chef
+fi
+
+DAEMON_OPTS="-d -c $CONFIG"
+
+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                           
+  kill -1 $pid
+  return $?
+}   
+
+force_stop() {
+  [ ! -e "$PIDFILE" ] && return
+  if running ; then
+    kill -15 $pid
+    sleep "$DIETIME"s
+    if running ; then
+      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 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
+

Added: packages-wip/chef/trunk/debian/chef-indexer.manpages
===================================================================
--- packages-wip/chef/trunk/debian/chef-indexer.manpages	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-indexer.manpages	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1 @@
+debian/chef-indexer.1

Added: packages-wip/chef/trunk/debian/chef-server-slice.dirs
===================================================================
--- packages-wip/chef/trunk/debian/chef-server-slice.dirs	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-server-slice.dirs	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,7 @@
+var/cache/chef
+var/lib/chef/cookbooks
+var/lib/chef/openid
+var/lib/chef/search_index
+var/log/chef
+usr/share/doc/chef-server-slice
+usr/share/chef-server-slice/app

Added: packages-wip/chef/trunk/debian/chef-server.1
===================================================================
--- packages-wip/chef/trunk/debian/chef-server.1	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-server.1	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,104 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
+.TH CHEF-SERVER "1" "July 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).

Added: packages-wip/chef/trunk/debian/chef-server.dirs
===================================================================
--- packages-wip/chef/trunk/debian/chef-server.dirs	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-server.dirs	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,11 @@
+var/cache/chef
+var/lib/chef/cookbooks
+var/lib/chef/openid
+var/lib/chef/openid/store
+var/lib/chef/openid/cstore
+var/log/chef
+usr/bin
+usr/share/doc/chef-server
+usr/share/chef-server
+etc/chef
+etc/chef/certificates

Added: packages-wip/chef/trunk/debian/chef-server.init
===================================================================
--- packages-wip/chef/trunk/debian/chef-server.init	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-server.init	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,120 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:           chef-server
+# Required-Start:     $network
+# Required-Stop:      $network
+# Default-Start:      2 3 4 5
+# Default-Stop:       0 1 6
+# Short-Description:  Start a chef-server.
+### END INIT INFO
+#
+# Copyright (c) 2009 Joshua Timberman, <joshua at opscode.com>
+#
+# chef-server         Startup script for chef-server.
+# chkconfig: - 98 02
+# description: starts up chef-server webui.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/chef-server
+PIDFILE=/var/run/chef/server.%s.pid
+MAINPID=/var/run/chef/server.main.pid
+MASTER=master
+NAME=chef-server
+DESC=chef-server
+DAEMON_OPTS="-d -c2 -P $PIDFILE"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+if [ ! -d /var/run/chef ]; then
+  mkdir /var/run/chef
+fi
+
+running() {
+  [ ! -f  "$MAINPID" ] &&  return 1
+  pid=`cat $MAINPID`
+  name=$MASTER
+  [ -z "$pid" ] && return 1
+  [ ! -d /proc/$pid ] && return 1
+  cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | head -1 | awk -F:\  '{print $3}'`
+  echo "$cmd is $pid, for $name"
+  [ "$cmd" != "$name" ] &&  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 1
+    fi
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|status}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
+

Added: packages-wip/chef/trunk/debian/chef-server.manpages
===================================================================
--- packages-wip/chef/trunk/debian/chef-server.manpages	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-server.manpages	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1 @@
+debian/chef-server.1

Added: packages-wip/chef/trunk/debian/chef-solo.8
===================================================================
--- packages-wip/chef/trunk/debian/chef-solo.8	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef-solo.8	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,54 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH CHEF-SOLO: "8" "July 2009" "chef-solo 0.7.4" "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

Added: packages-wip/chef/trunk/debian/chef.dirs
===================================================================
--- packages-wip/chef/trunk/debian/chef.dirs	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef.dirs	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,7 @@
+var/cache/chef
+var/lib/chef/openid
+var/lib/chef/search_index
+var/log/chef
+usr/bin
+etc/chef
+etc/init.d

Added: packages-wip/chef/trunk/debian/chef.manpages
===================================================================
--- packages-wip/chef/trunk/debian/chef.manpages	                        (rev 0)
+++ packages-wip/chef/trunk/debian/chef.manpages	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,2 @@
+debian/chef-client.8
+debian/chef-solo.8

Added: packages-wip/chef/trunk/debian/compat
===================================================================
--- packages-wip/chef/trunk/debian/compat	                        (rev 0)
+++ packages-wip/chef/trunk/debian/compat	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1 @@
+7

Added: packages-wip/chef/trunk/debian/control
===================================================================
--- packages-wip/chef/trunk/debian/control	                        (rev 0)
+++ packages-wip/chef/trunk/debian/control	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,96 @@
+Source: chef
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <joshua at opscode.com>
+Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
+Build-Depends-Indep: ruby, rake
+Standards-Version: 3.8.2
+Homepage: http://wiki.opscode.com/display/chef/Home
+
+Package: chef
+Architecture: all
+Depends: ${misc:Depends}, ruby, ruby1.8, libopenid-ruby, liberubis-ruby, libjson-ruby, libextlib-ruby, libstomp-ruby, libohai-ruby, libchef-ruby
+Recommends: rake
+Description: configuration management system written in Ruby
+ Chef is a systems integration framework and configuration management system
+ 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.
+ .
+ Chef can be run as a client (chef-client) to a server, or run as a standalone
+ tool (chef-solo). Configuration recipes are written in a pure Ruby DSL.
+ .
+ This package contains the chef-client and chef-solo binaries and associated 
+ files.
+
+Package: chef-indexer
+Architecture: all
+Depends: ${misc:Depends}, ruby, stompserver, couchdb, libferret-ruby, libjson-ruby, libchef-ruby
+Description: Creates search indexes of Chef node attributes
+ The chef indexer listens to a message queue via stomp for changes to search
+ indexes. It then either creates or deletes entries in the index according 
+ to the information it is passed.
+
+Package: chef-server
+Architecture: all
+Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, chef-server-slice, stompserver, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libsyntax-ruby, chef-indexer, libchef-ruby
+Recommends: rake
+Suggests: thin, nginx, apache2
+Description: Merb application providing centralized management for Chef
+ Chef is a systems integration framework and configuration management system
+ 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.
+ .
+ The Chef Server is a Merb application that provides centralized storage and
+ distribution for recipes stored in "cookbooks," management and authentication
+ of client nodes and node data, and search indexes for that data.
+ .
+ The chef-server package provides a merb binary wrapper that loads up the
+ chef-server-slice application.
+ .
+ This package contains the chef-server Merb application and associated files.
+
+Package: chef-server-slice
+Architecture: all
+Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, stompserver, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libsyntax-ruby, libchef-ruby
+Description: Merb app slice providing centralized management for Chef
+ Chef is a systems integration framework and configuration management system
+ 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.
+ .
+ The Chef Server is a Merb application that provides centralized storage and
+ distribution for recipes stored in "cookbooks," management and authentication
+ of client nodes and node data, and search indexes for that data.
+ .
+ The chef-server-slice package contains all the goods for the Chef Server and is
+ started with the chef-server program.
+ .
+ This package contains the Merb slice for the chef-server.
+
+Package: libchef-ruby
+Architecture: all
+Depends: ${misc:Depends}, ruby, ruby1.8, libchef-ruby1.8
+Description: Ruby libraries for Chef configuration management system
+ Chef is a systems integration framework and configuration management system
+ 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.
+ .
+ As a library, Chef allows administrators to easily tie various infrastructure
+ components together.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual chef libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libchef-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, libmixlib-cli-ruby, libmixlib-config-ruby (>= 1.0.9), libmixlib-log-ruby
+Recommends: rake
+Description: Ruby 1.8 libraries for Chef configuration management system
+ Chef is a systems integration framework and configuration management system
+ 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.
+ .
+ As a library, Chef allows administrators to easily tie various infrastructure
+ components together.
+ .
+ This package contains chef libraries for Ruby 1.8.

Added: packages-wip/chef/trunk/debian/copyright
===================================================================
--- packages-wip/chef/trunk/debian/copyright	                        (rev 0)
+++ packages-wip/chef/trunk/debian/copyright	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,35 @@
+This package was debianized by Joshua TImberman <joshua at opscode.com> 
+Thu, 30 Jul 2009 21:06:25 -0600
+
+It was downloaded from <http://github.com/opscode/chef>
+
+Developed at Opscode (http://www.opscode.com).
+
+Contributors and Copyright holders:
+
+ * Copyright 2008, Adam Jacob <adam at opscode.com>
+ * Copyright 2008, Arjuna Christensen <aj at hjksolutions.com>
+ * Copyright 2008, Bryan McLellan <btm at loftninjas.org>
+ * Copyright 2008, Ezra Zygmuntowicz <ezra at engineyard.com>
+ * Copyright 2009, Joshua Timberman <joshua at opscode.com>
+ * Copyright 2009, Sean Cribbs <seancribbs at gmail.com>
+ * Copyright 2009, Christopher Brown <cb at opscode.com>
+ * Copyright 2009, Thom May <thom at clearairturbulence.org>
+ * Copyright 2009, Joe Williams <joe at joetify.com>
+
+Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.
+
+Chef incorporates code modified from Merb (http://www.merbivore.com), which is Copyright (c) 2008 Engine Yard.
+
+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.
+

Added: packages-wip/chef/trunk/debian/etc/chef/client.rb
===================================================================
--- packages-wip/chef/trunk/debian/etc/chef/client.rb	                        (rev 0)
+++ packages-wip/chef/trunk/debian/etc/chef/client.rb	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,96 @@
+# Configuration File For Chef (chef-client)
+# 
+# The chef-client program will connect the local system to the specified
+# server URLs through a RESTful API to retrieve its configuration.
+# 
+# By default, the client is configured to connect to a Chef Server
+# running on the local system. Change this to reflect your environment.
+#
+# Chef uses a Ruby DSL for configuration, and this file contains a few
+# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
+# :value. Second, in Ruby, everything but false and nil (no quotes or other
+# designations) is true, including true, the integer 0 and the string "false".
+# So to set the value of a setting to false, write:
+#
+# some_setting false
+#
+# Third, Ruby class methods can be used, for example we tell the log to show
+# the current time stamp with Chef::Log::Formatter.show_time, below.
+#
+# log_level specifies the level of verbosity for output.
+# valid values are: :debug, :info, :warn, :error, :fatal
+
+log_level          :info
+
+# log_location specifies where the client should log to.
+# valid values are: a quoted string specifying a file, or STDOUT with
+# no quotes. When run as a daemon (default), STDOUT will produce no output.
+
+log_location       "/var/log/chef/client.log"
+
+# ssl_verify_mode specifies if the REST client should verify SSL certificates.
+# valid values are :verify_none, :verify_peer. The default Chef Server 
+# installation on Debian will use a self-generated SSL certificate so this
+# should be :verify_none unless you replace the certificate.
+
+ssl_verify_mode    :verify_none
+
+# Server URLs.
+# 
+# registration_url specifies the URL which the client retrieves to register.
+# valid values are any HTTP URL.
+
+registration_url   "http://localhost:4000"
+
+# openid_url specifies the URL where the server's OpenID relay is listening.
+# valid values are any HTTP URL. The default server configuration is set to
+# use a vhost running on port 444 for this.
+#
+# NOTE: The client/server openid communication will be removed in favor of a
+# pre-shared key authentication and authorization architecture in a future 
+# release of Chef. This is currently scheduled for version 0.8.0.
+
+openid_url         "http://localhost:4001"
+
+# template_url specifies the URL where the client should retrieve templates.
+# valid values are any HTTP URL.
+
+template_url       "http://localhost:4000"
+
+# remotefile_url specifies the URL where the client should retrieve remote 
+# static file and directory contents.
+# valid values are any HTTP URL.
+
+remotefile_url     "http://localhost:4000"
+
+# search_url specifies the URL where the client should send queries for search
+# indexes.
+# valid values are any HTTP URL.
+
+search_url         "http://localhost:4000"
+
+# role_url specifies the URL where the client should look for role data.
+# valid values are any HTTP URL.
+
+role_url           "http://localhost:4000"
+
+# file_cache_path specifies where the client should cache cookbooks, server
+# cookie ID, and openid registration data.
+# valid value is any filesystem directory location.
+
+file_cache_path    "/var/cache/chef"
+
+# pid_file specifies the location of where chef-client daemon should keep the pid
+# file.
+# valid value is any filesystem file location.
+
+pid_file           "/var/run/chef/client.pid"
+
+# Chef::Log::Formatter.show_time specifies whether the chef-client log should
+# contain timestamps. 
+# valid values are true or false (no quotes, see above about Ruby idioms). The
+# printed timestamp is rfc2822, for example:
+# Fri, 31 Jul 2009 19:19:46 -0600
+
+Chef::Log::Formatter.show_time = true
+

Added: packages-wip/chef/trunk/debian/etc/chef/indexer.rb
===================================================================
--- packages-wip/chef/trunk/debian/etc/chef/indexer.rb	                        (rev 0)
+++ packages-wip/chef/trunk/debian/etc/chef/indexer.rb	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,43 @@
+# Configuration File For Chef Indexer (chef-indexer) 
+#
+# The chef-indexer program runs on the Chef Server to generate search indexes
+# of node data stored in the Server's CouchDB store. Currently, the search 
+# uses ferret, a pure-Ruby search library. In a future version of Chef this 
+# will change, so please be aware.
+#
+# Chef uses a Ruby DSL for configuration, and this file may contain some
+# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
+# :value. Second, in Ruby, everything but false and nil (no quotes or other
+# designations) is true, including true, the integer 0 and the string "false".
+# So to set the value of a setting to false, write:
+#
+# some_setting false
+#
+# Third, Ruby class methods can be used, for example we tell the log to show
+# the current time stamp with Chef::Log::Formatter.show_time, below.
+#
+# log_location specifies where the indexer should log to.
+# valid values are: a quoted string specifying a file, or STDOUT with
+# no quotes. When run as a daemon (default), STDOUT will produce no output.
+
+log_location       "/var/log/chef/indexer.log"
+
+# search_index_path specifies where the indexer should store the indexes.
+# valid value is any filesystem directory location.
+
+search_index_path    "/var/lib/chef/search_index"
+
+# pid_file specifies the location of where chef-indexer daemon should keep the 
+# pid file.
+# valid value is any filesystem file location.
+
+pid_file           "/var/run/chef/indexer.pid"
+
+# Chef::Log::Formatter.show_time specifies whether the chef-client log should
+# contain timestamps. 
+# valid values are true or false (no quotes, see above about Ruby idioms). The
+# printed timestamp is rfc2822, for example:
+# Fri, 31 Jul 2009 19:19:46 -0600
+
+Chef::Log::Formatter.show_time = true
+

Added: packages-wip/chef/trunk/debian/etc/chef/server.rb
===================================================================
--- packages-wip/chef/trunk/debian/etc/chef/server.rb	                        (rev 0)
+++ packages-wip/chef/trunk/debian/etc/chef/server.rb	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,159 @@
+# Configuration File For Chef (chef-server)
+# 
+# chef-server is a Merb application slice. By default it is configured to
+# run via Mongrel, the default Merb adapter. This should be run as:
+#
+#		chef-server -c2 
+#
+#	Which specifies two workers, so that chef-server has a worker to handle
+# OpenID requests. The two processes will be listening on port 4000 and 4001,
+# see the URL settings below.
+#
+# For details on how to set up the chef-server with a web front end proxy 
+# (nginx, apache, etc) or as an application under Passenger, see the Chef 
+# Wiki, under Additional Resources.
+#
+# This file configures the behavior of the running server itself.
+#
+# Chef uses a Ruby DSL for configuration, and this file contains a few
+# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
+# :value. Second, in Ruby, everything but false and nil (no quotes or other
+# designations) is true, including true, the integer 0 and the string "false".
+# So to set the value of a setting to false, write:
+#
+# some_setting false
+#
+# Third, Ruby class methods can be used, for example we tell the log to show
+# the current time stamp with Chef::Log::Formatter.show_time, below.
+#
+# log_level specifies the level of verbosity for output.
+# valid values are: :debug, :info, :warn, :error, :fatal
+
+log_level          :info
+
+# log_location specifies where the server should log to.
+# valid values are: a quoted string specifying a file, or STDOUT with
+# no quotes. This is the application log for the Merb workers that get
+# spawned.
+
+log_location       "/var/log/chef/server.log"
+
+# ssl_verify_mode specifies if the REST client should verify SSL certificates.
+# valid values are :verify_none, :verify_peer. The default Chef Server 
+# installation on Debian will use a self-generated SSL certificate so this
+# should be :verify_none unless you replace the certificate.
+
+ssl_verify_mode    :verify_none
+
+# The next few settings specify the URL where chef-server should respond
+# for various components. 
+#
+# registration_url specifies the URL which clients retrieve to register.
+# valid values are any HTTP URL.
+
+registration_url   "http://localhost:4000"
+
+# openid_url specifies the URL where the server's OpenID relay is listening.
+# valid values are any HTTP URL. This should be one port higher than the other
+# URLs.
+#
+# NOTE: The client/server openid communication will be removed in favor of a
+# pre-shared key authentication and authorization architecture in a future 
+# release of Chef. This is currently scheduled for version 0.8.0.
+
+openid_url         "http://localhost:4001"
+
+# template_url specifies the URL where clients should retrieve templates.
+# valid values are any HTTP URL.
+
+template_url       "http://localhost:4000"
+
+# remotefile_url specifies the URL where clients should retrieve remote 
+# static file and directory contents.
+# valid values are any HTTP URL.
+
+remotefile_url     "http://localhost:4000"
+
+# search_url specifies the URL where the client should send queries for search
+# indexes.
+# valid values are any HTTP URL.
+
+search_url         "http://localhost:4000"
+
+# role_url specifies the URL where the client should look for role data.
+# valid values are any HTTP URL.
+
+role_url           "http://localhost:4000"
+
+# file_cache_path specifies where the client should cache cookbooks, server
+# cookie ID, and openid registration data.
+# valid value is any filesystem directory location.
+
+file_cache_path    "/var/cache/chef"
+
+# validation_token specifies a token that clients can use to automatically authorize
+# with the server, normally this must be done through the webui.
+# valid value is a string. This should be alphanumeric, otherwise unexpected things 
+# may occur. This is commented out so the default value gets set to nil (invalid,
+# unusable) so we're not shipping a default known value. If you want to use this
+# feature, you'll need to uncomment it, set a good value (random strings of 20+ 
+# characters work well), and restart the chef-server.
+
+#validation_token   ""
+
+# cookbook_path is a Ruby array of filesystem locations to search for cookbooks.
+# valid value is a string, or an array of strings of filesystem directory locations.
+# This setting is searched beginning (index 0) to end in order. You might specify
+# multiple search paths for cookbooks if you want to use an upstream source, and
+# provide localised "site" overrides.
+# The default value, /srv/chef/cookbooks does not contain any cookbooks by default.
+# See the Chef Wiki for more information about setting up a local repository for
+# working on cookbooks.
+# http://wiki.opscode.com/display/chef/Chef+Repository
+
+#cookbook_path      [ "/srv/chef/site-cookbooks", "/srv/chef/cookbooks" ]
+cookbook_path      [ "/srv/chef/cookbooks" ]
+
+# file_cache_path specifies where the client should cache cookbooks, server
+# cookie ID, and openid registration data.
+# valid value is any filesystem directory location.
+
+file_cache_path    "/var/cache/chef"
+
+# node_path specifies a location for where to find node-specific recipes.
+# valid values are any filesystem direcory location.
+
+node_path          "/srv/chef/nodes"
+
+# openid_store_path specifies a location where to keep openid nonces for clients.
+# valid values are any filesystem directory location.
+
+openid_store_path  "/var/lib/chef/openid/store"
+
+# openid_store_path specifies a location where to keep openid nonces for clients.
+# valid values are any filesystem directory location.
+
+openid_cstore_path "/var/lib/chef/openid/cstore"
+
+# search_index_path tells the indexer where to store search indexes.
+# valid values are any filesystem directory location.
+
+search_index_path  "/var/lib/chef/search_index"
+
+# role_path designates where the server should load role JSON and Ruby DSL 
+# files from.
+# valid values are any filesystem directory location. Roles are a feature 
+# that allow you to easily reuse lists of recipes and attribute settings.
+# Please see the Chef Wiki page for information on how to utilize the feature.
+# http://wiki.opscode.com/display/chef/Roles
+
+role_path          "/srv/chef/roles"
+
+# Chef::Log::Formatter.show_time specifies whether the chef-client log should
+# contain timestamps. 
+# valid values are true or false (no quotes, see above about Ruby idioms). The
+# printed timestamp is rfc2822, for example:
+# Fri, 31 Jul 2009 19:19:46 -0600
+
+Chef::Log::Formatter.show_time = true
+

Added: packages-wip/chef/trunk/debian/etc/chef/solo.rb
===================================================================
--- packages-wip/chef/trunk/debian/etc/chef/solo.rb	                        (rev 0)
+++ packages-wip/chef/trunk/debian/etc/chef/solo.rb	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,50 @@
+# Configuration File For Chef Solo (chef-solo) 
+#
+# The program chef-solo allows you to run Chef as a standalone program
+# without connecting to a remote Chef Server.
+#
+# Chef uses a Ruby DSL for configuration, and this file may contain some
+# Ruby idioms. First, symbols. These are designated by a colon sigil, ie,
+# :value. Second, in Ruby, everything but false and nil (no quotes or other
+# designations) is true, including true, the integer 0 and the string "false".
+# So to set the value of a setting to false, write:
+#
+# some_setting false
+#
+# Third, Ruby class methods can be used, for example we tell the log to show
+# the current time stamp with Chef::Log::Formatter.show_time, below.
+#
+# log_level specifies the level of verbosity for output.
+# valid values are: :debug, :info, :warn, :error, :fatal
+
+log_level          :info
+
+# log_location specifies where the client should log to.
+# valid values are: a quoted string specifying a file, or STDOUT with
+# no quotes.
+
+log_location       STDOUT
+
+# file_cache_path specifies where solo should look for the cookbooks to use
+# valid value is any filesystem directory location. This is slightly 
+# different from 'normal' client mode as solo is actually downloading (or 
+# using) the specified cookbooks in this location.
+
+file_cache_path    "/srv/chef"
+
+# cookbook_path specifies where solo should look for cookbooks it will use.
+# valid value is a string, or array of strings of filesystem directory locations.
+# This setting is similar to the server setting of the same name. Solo will use
+# this as a search location, in Array order. It should be a subdirectory of
+# file_cache_path, above.
+
+cookbook_path      [ "/srv/chef/cookbooks" ]
+
+# Chef::Log::Formatter.show_time specifies whether the chef-client log should
+# contain timestamps. 
+# valid values are true or false (no quotes, see above about Ruby idioms). The
+# printed timestamp is rfc2822, for example:
+# Fri, 31 Jul 2009 19:19:46 -0600
+
+Chef::Log::Formatter.show_time = true
+

Added: packages-wip/chef/trunk/debian/patches/fix_slice_dirs.patch
===================================================================
--- packages-wip/chef/trunk/debian/patches/fix_slice_dirs.patch	                        (rev 0)
+++ packages-wip/chef/trunk/debian/patches/fix_slice_dirs.patch	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,18 @@
+# Because we're not using the typical rubygems method of running Chef, the 
+# slice needs to manually load its root directory and the location of
+# controllers and views.
+Index: chef-0.7.4/chef-server-slice/lib/chef-server-slice.rb
+===================================================================
+--- chef-0.7.4.orig/chef-server-slice/lib/chef-server-slice.rb	2009-08-06 00:25:23.000000000 -0600
++++ chef-0.7.4/chef-server-slice/lib/chef-server-slice.rb	2009-08-06 00:26:19.000000000 -0600
+@@ -33,6 +33,10 @@
+     # Stub classes loaded hook - runs before LoadClasses BootLoader
+     # right after a slice's classes have been loaded internally.
+     def self.loaded
++      ChefServerSlice.root = "/usr/share/chef-server-slice"
++      Merb.push_path(:controller, ChefServerSlice.root / "app" / "controllers", "**/*.rb")
++      Merb.push_path(:views,      ChefServerSlice.root / "app" / "views", "**/*.rb")
++
+       Chef::Queue.connect
+ 
+       # create the couch databases for openid association and nonce storage, if configured

Added: packages-wip/chef/trunk/debian/patches/remove_rubygems.patch
===================================================================
--- packages-wip/chef/trunk/debian/patches/remove_rubygems.patch	                        (rev 0)
+++ packages-wip/chef/trunk/debian/patches/remove_rubygems.patch	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,129 @@
+# Remove rubygems from the various bits of chef.
+# Also set up chef-server program to load slice correctly due to no rubygems.
+Index: chef-0.7.4/chef-server/bin/chef-indexer
+===================================================================
+--- chef-0.7.4.orig/chef-server/bin/chef-indexer	2009-08-05 15:52:22.000000000 -0600
++++ chef-0.7.4/chef-server/bin/chef-indexer	2009-08-05 15:52:31.000000000 -0600
+@@ -20,7 +20,6 @@
+ 
+ $: << File.join(File.dirname(__FILE__), "..", "lib")
+ 
+-require 'rubygems'
+ require 'chef/application/indexer'
+ 
+-Chef::Application::Indexer.new.run
+\ No newline at end of file
++Chef::Application::Indexer.new.run
+Index: chef-0.7.4/chef-server/bin/chef-server
+===================================================================
+--- chef-0.7.4.orig/chef-server/bin/chef-server	2009-08-05 17:22:54.000000000 -0600
++++ chef-0.7.4/chef-server/bin/chef-server	2009-08-05 17:25:20.000000000 -0600
+@@ -23,13 +23,10 @@
+ # Add chef and chef-server-slice lib dirs to the load path
+ # Load chef and chef-server slice from source rather than gem, if present
+ 
+-require "rubygems"
+ require "merb-core"
+-
+-[ 'chef', 'chef-server-slice' ].each do |lib|
+-  library = File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb")
+-  require library if File.exists?(library)
+-end
++require "chef"
++require "/usr/share/chef-server-slice/lib/chef-server-slice"
++require "openid/util"
+ 
+ ObjectSpace.each_object(Gem::Specification) do |gem|
+   next unless gem.name == "chef-server"
+@@ -37,13 +34,15 @@
+   break
+ end
+ 
++CHEF_SERVER_VERSION = "0.7.4" unless defined?(CHEF_SERVER_VERSION)
++
+ # Ensure the chef gem we load is the same version as the chef server
+ unless defined?(Chef)
+   gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
+   require 'chef'  
+ end
+ 
+-Dir.chdir File.join(File.dirname(__FILE__),"..")
++Dir.chdir File.join(File.dirname(__FILE__),"..", "share", "chef-server")
+ __DIR__ = Dir.getwd
+ 
+ if ARGV[0] && ARGV[0] =~ /^[^-]/
+Index: chef-0.7.4/chef-server/public/merb.fcgi
+===================================================================
+--- chef-0.7.4.orig/chef-server/public/merb.fcgi	2009-08-05 15:54:06.000000000 -0600
++++ chef-0.7.4/chef-server/public/merb.fcgi	2009-08-05 15:54:10.000000000 -0600
+@@ -1,6 +1,5 @@
+ #!/usr/bin/env ruby
+                                                                
+-require 'rubygems'
+ require 'merb-core'
+ 
+ # this is Merb.root, change this if you have some funky setup.
+@@ -19,4 +18,4 @@
+ # start merb with the fcgi adapter, add options or change the log dir here
+ Merb.start(:adapter => 'fcgi',
+            :merb_root => merb_root,
+-           :log_file => merb_root /'log'/'merb.log')
+\ No newline at end of file
++           :log_file => merb_root /'log'/'merb.log')
+Index: chef-0.7.4/chef/bin/chef-client
+===================================================================
+--- chef-0.7.4.orig/chef/bin/chef-client	2009-08-05 15:52:41.000000000 -0600
++++ chef-0.7.4/chef/bin/chef-client	2009-08-05 15:52:48.000000000 -0600
+@@ -20,7 +20,6 @@
+ 
+ $: << File.join(File.dirname(__FILE__), "..", "lib")
+ 
+-require 'rubygems'
+ require 'chef/application/client'
+ 
+-Chef::Application::Client.new.run
+\ No newline at end of file
++Chef::Application::Client.new.run
+Index: chef-0.7.4/chef/bin/chef-solo
+===================================================================
+--- chef-0.7.4.orig/chef/bin/chef-solo	2009-08-05 15:52:54.000000000 -0600
++++ chef-0.7.4/chef/bin/chef-solo	2009-08-05 15:52:58.000000000 -0600
+@@ -20,7 +20,6 @@
+ 
+ $: << File.join(File.dirname(__FILE__), "..", "lib")
+ 
+-require 'rubygems'
+ require 'chef/application/solo'
+ 
+ Chef::Application::Solo.new.run
+Index: chef-0.7.4/chef/lib/chef.rb
+===================================================================
+--- chef-0.7.4.orig/chef/lib/chef.rb	2009-08-05 15:55:38.000000000 -0600
++++ chef-0.7.4/chef/lib/chef.rb	2009-08-05 15:55:47.000000000 -0600
+@@ -19,7 +19,6 @@
+ $:.unshift(File.dirname(__FILE__)) unless
+   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+ 
+-require 'rubygems'
+ require 'extlib'
+ require 'chef/exceptions'
+ require 'chef/log'
+Index: chef-0.7.4/chef/lib/chef/openid_registration.rb
+===================================================================
+--- chef-0.7.4.orig/chef/lib/chef/openid_registration.rb	2009-08-05 15:55:16.000000000 -0600
++++ chef-0.7.4/chef/lib/chef/openid_registration.rb	2009-08-05 15:55:24.000000000 -0600
+@@ -20,7 +20,6 @@
+ require 'chef/mixin/params_validate'
+ require 'chef/couchdb'
+ require 'digest/sha1'
+-require 'rubygems'
+ require 'json'
+ 
+ class Chef
+@@ -178,4 +177,4 @@
+       end
+     
+   end
+-end
+\ No newline at end of file
++end

Added: packages-wip/chef/trunk/debian/patches/series
===================================================================
--- packages-wip/chef/trunk/debian/patches/series	                        (rev 0)
+++ packages-wip/chef/trunk/debian/patches/series	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,2 @@
+remove_rubygems.patch
+fix_slice_dirs.patch

Added: packages-wip/chef/trunk/debian/rules
===================================================================
--- packages-wip/chef/trunk/debian/rules	                        (rev 0)
+++ packages-wip/chef/trunk/debian/rules	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+
+CDBS_NO_DOC_SYMLINKING = ""
+
+PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
+DEB_RUBY_SETUP_CMD = debian-setup.rb
+DEB_RUBY_CONFIG_ARGS = --installdirs=std
+
+CHEF_INSTALL_SETUP_CMD = \
+  if [ ! -L chef/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f chef/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv chef/$(DEB_RUBY_SETUP_CMD) chef/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) chef/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+CHEF_REMOVE_SETUP_CMD = \
+  if [ -L chef/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm chef/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f chef/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv chef/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build chef/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+install/chef::
+	dh_installinit --name chef-client 
+	cp -rf $(CURDIR)/debian/etc/chef/client.rb $(CURDIR)/debian/chef/etc/chef
+	cp -rf $(CURDIR)/debian/etc/chef/solo.rb $(CURDIR)/debian/chef/etc/chef
+	dh_installchangelogs
+	dh_installdirs
+
+install/libchef-ruby1.8::
+	$(CHEF_INSTALL_SETUP_CMD)
+	(cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd chef && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libchef-ruby1.8)
+	mv $(CURDIR)/debian/libchef-ruby1.8/usr/bin/chef-client $(CURDIR)/debian/chef/usr/bin/
+	mv $(CURDIR)/debian/libchef-ruby1.8/usr/bin/chef-solo $(CURDIR)/debian/chef/usr/bin/
+	rmdir $(CURDIR)/debian/libchef-ruby1.8/usr/bin/
+
+install/chef-indexer::
+	dh_installchangelogs
+	dh_installdirs
+	cp debian/etc/chef/indexer.rb debian/chef-indexer/etc/chef
+	cp chef-server/bin/chef-indexer debian/chef-indexer/usr/bin
+
+install/chef-server::
+	cp debian/etc/chef/server.rb  debian/chef-server/etc/chef
+	cp chef-server/bin/chef-server  debian/chef-server/usr/bin
+	cp chef-server/README.rdoc debian/chef-server/usr/share/doc/chef-server
+	cp chef-server/config.ru debian/chef-server/usr/share/chef-server
+	cp -rf chef-server/app    debian/chef-server/usr/share/chef-server
+	cp -rf chef-server/config debian/chef-server/usr/share/chef-server
+	cp -rf chef-server/lib    debian/chef-server/usr/share/chef-server
+	cp -rf chef-server/public debian/chef-server/usr/share/chef-server
+
+install/chef-server-slice::
+	cp chef-server-slice/README.rdoc debian/chef-server-slice/usr/share/doc/chef-server-slice
+	cp -rf chef-server-slice/app debian/chef-server-slice/usr/share/chef-server-slice
+	cp -rf chef-server-slice/config debian/chef-server-slice/usr/share/chef-server-slice
+	cp -rf chef-server-slice/public debian/chef-server-slice/usr/share/chef-server-slice
+	cp -rf chef-server-slice/lib debian/chef-server-slice/usr/share/chef-server-slice
+	rm debian/chef-server-slice/usr/share/chef-server-slice/public/images/treeBuilderImages/Thumbs.db
+	find debian/chef-server-slice -type f -perm +755 -exec chmod 644 {} \;
+	dh_installchangelogs
+	dh_installdirs
+
+clean::
+	$(CHEF_REMOVE_SETUP_CMD)
+	rm -f $(DEB_SRCDIR)/.config
+	rm -f $(DEB_SRCDIR)/InstalledFiles


Property changes on: packages-wip/chef/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages-wip/chef/trunk/debian/watch
===================================================================
--- packages-wip/chef/trunk/debian/watch	                        (rev 0)
+++ packages-wip/chef/trunk/debian/watch	2009-08-07 00:29:52 UTC (rev 3879)
@@ -0,0 +1,2 @@
+version=3
+http://githubredir.debian.net/github/opscode/chef /(.*).tar.gz




More information about the Pkg-ruby-extras-commits mailing list