[DRE-commits] r3925 - in trunk/chef/debian: . patches
Joshua Timberman
jtimberman-guest at alioth.debian.org
Wed Aug 12 22:07:26 UTC 2009
Author: jtimberman-guest
Date: 2009-08-12 22:07:26 +0000 (Wed, 12 Aug 2009)
New Revision: 3925
Modified:
trunk/chef/debian/README.Debian
trunk/chef/debian/README.chef-server
trunk/chef/debian/changelog
trunk/chef/debian/chef-client.8
trunk/chef/debian/chef-indexer.1
trunk/chef/debian/chef-server.1
trunk/chef/debian/chef-server.init
trunk/chef/debian/chef-solo.8
trunk/chef/debian/control
trunk/chef/debian/copyright
trunk/chef/debian/patches/fix_slice_dirs.patch
trunk/chef/debian/patches/remove_rubygems.patch
trunk/chef/debian/rules
Log:
updating inital package to version 0.7.8
Modified: trunk/chef/debian/README.Debian
===================================================================
--- trunk/chef/debian/README.Debian 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/README.Debian 2009-08-12 22:07:26 UTC (rev 3925)
@@ -7,30 +7,38 @@
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
+Chef is normally distributed as a RubyGem, so 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.
+to point at the appropriate server. By default this is set to localhost.
/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"
+ registration_url "http://localhost:4000"
+ openid_url "http://localhost:4001"
+ template_url "http://localhost:4000"
+ remotefile_url "http://localhost:4000"
+ search_url "http://localhost:4000"
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.
+server is a Merb application slice, and by default the server will start up from
+an init script as a pair of Mongrels on ports 4000 (web/api access) and 4001
+(openid).
+Chef server uses CouchDB to store node attribute data.
+
+A note about RubyGems
+---------------------
+
+RubyGems is recommended for libchef-ruby1.8 because Chef has a resource that can
+handle Gem packages. That will only work in recipes if RubyGems is installed.
+
Additional Resources
--------------------
Modified: trunk/chef/debian/README.chef-server
===================================================================
--- trunk/chef/debian/README.chef-server 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/README.chef-server 2009-08-12 22:07:26 UTC (rev 3925)
@@ -2,44 +2,32 @@
----------------------
There are a number of ways to set up the chef-server. The default on Debian is
-to use Passenger (mod_rack) under Apache2.
+to use a pair of Mongrels. These will be started when the chef-server init
+script runs:
-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.)
+ chef-server -c2 -d
-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.
+This is using the default 'mongrel' adapter for the Merb application slice.
+When the Chef merb application starts, it runs a 'master' merb process and
+a number of 'worker' daemons up to the -c amount. Chef needs at least two;
+one for the webui/api and the other for the openid server. By default, these
+will start on ports 4000 and 4001:
-Make note of the filename, we'll need it shortly.
+ $ ps awux | grep merb
+ root 2558 0.0 0.9 22868 1128 ? S Aug11 0:01 merb : merb : master
+ root 3003 3.7 14.1 34032 17672 ? Sl Aug11 55:24 merb : spawner (ports 4000)
+ root 3005 0.0 1.2 34040 1508 ? S Aug11 0:00 merb : worker (port 4000)
+ root 3006 0.0 1.2 34040 1508 ? S Aug11 0:00 merb : worker (port 4001)
-2. Edit /etc/chef/apache.conf.
+Clients should connect to the server on port 4000 for all "URLs" except openid,
+which should be port 4001. See /etc/chef/client.rb for these settings.
- # vi /etc/chef/apache.conf
+Note that this setup does not speak SSL over HTTPS. To do that, the server
+needs to be configured with a web front end proxy, such as Apache2 or Nginx,
+or as a mod_rack application with Phusion's Passenger. More details on these
+configurations will be coming soon to the Chef wiki, including example config
+files.
-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
--------------------
Modified: trunk/chef/debian/changelog
===================================================================
--- trunk/chef/debian/changelog 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/changelog 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,5 +1,5 @@
-chef (0.7.6-1) unstable; urgency=low
+chef (0.7.8-1) unstable; urgency=low
- * Initial release (Closes: #529392)
+ * Initial release (Closes: #529392)
- -- Joshua Timberman <joshua at opscode.com> Sat, 08 Aug 2009 00:03:54 -0600
+ -- Joshua Timberman <joshua at opscode.com> Wed, 12 Aug 2009 12:18:48 -0600
Modified: trunk/chef/debian/chef-client.8
===================================================================
--- trunk/chef/debian/chef-client.8 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/chef-client.8 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,5 +1,5 @@
.\" 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"
+.TH CHEF-CLIENT: "8" "August 2009" "chef-client 0.7.8" "System Administration Utilities"
.SH NAME
chef-client: \- Runs a client node connecting to a chef-server.
.SH SYNOPSIS
Modified: trunk/chef/debian/chef-indexer.1
===================================================================
--- trunk/chef/debian/chef-indexer.1 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/chef-indexer.1 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,5 +1,5 @@
.\" 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"
+.TH CHEF-INDEXER: "1" "August 2009" "chef-indexer 0.7.8" "User Commands"
.SH NAME
chef-indexer: \- Runs the search index process.
.SH SYNOPSIS
Modified: trunk/chef/debian/chef-server.1
===================================================================
--- trunk/chef/debian/chef-server.1 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/chef-server.1 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
-.TH CHEF-SERVER "1" "July 2009" "chef-server" "User Commands"
+.TH CHEF-SERVER "1" "August 2009" "chef-server" "User Commands"
.SH NAME
chef-server \- Start the Chef Server merb application slice.
.SH SYNOPSIS
Modified: trunk/chef/debian/chef-server.init
===================================================================
--- trunk/chef/debian/chef-server.init 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/chef-server.init 2009-08-12 22:07:26 UTC (rev 3925)
@@ -38,7 +38,6 @@
[ -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
}
Modified: trunk/chef/debian/chef-solo.8
===================================================================
--- trunk/chef/debian/chef-solo.8 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/chef-solo.8 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,5 +1,5 @@
.\" 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"
+.TH CHEF-SOLO: "8" "August 2009" "chef-solo 0.7.8" "System Administration Utilities"
.SH NAME
chef-solo: \- Runs chef in solo mode against a specified cookbook location.
.SH SYNOPSIS
Modified: trunk/chef/debian/control
===================================================================
--- trunk/chef/debian/control 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/control 2009-08-12 22:07:26 UTC (rev 3925)
@@ -2,16 +2,15 @@
Section: ruby
Priority: extra
Maintainer: Joshua Timberman <joshua at opscode.com>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
Build-Depends-Indep: ruby, rake
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/chef/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/chef/
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
+Depends: ${misc:Depends}, ruby1.8, libopenid-ruby, liberubis-ruby, libjson-ruby, libextlib-ruby, libstomp-ruby, libohai-ruby, libchef-ruby, libopenssl-ruby
Recommends: rake
Description: configuration management system written in Ruby
Chef is a systems integration framework and configuration management system
@@ -26,7 +25,7 @@
Package: chef-indexer
Architecture: all
-Depends: ${misc:Depends}, ruby, stompserver, couchdb, libferret-ruby, libjson-ruby, libchef-ruby
+Depends: ${misc:Depends}, ruby, stompserver, 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
@@ -34,7 +33,7 @@
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
+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, libcoderay-ruby, chef-indexer, libchef-ruby
Recommends: rake
Suggests: thin, nginx, apache2
Description: Merb application providing centralized management for Chef
@@ -53,7 +52,7 @@
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
+Depends: ${misc:Depends}, ruby, merb-slices, libmerb-assets-ruby, libmerb-haml-ruby, libmerb-helpers-ruby, stompserver, couchdb, libferret-ruby, mongrel, libopenid-ruby, libjson-ruby, libcoderay-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
@@ -70,7 +69,7 @@
Package: libchef-ruby
Architecture: all
-Depends: ${misc:Depends}, ruby, ruby1.8, libchef-ruby1.8
+Depends: ${misc:Depends}, ruby, 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
@@ -85,8 +84,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
+Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby, libmixlib-cli-ruby, libmixlib-config-ruby (>= 1.0.9), libmixlib-log-ruby, libohai-ruby
+Recommends: rake, rubygems
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
Modified: trunk/chef/debian/copyright
===================================================================
--- trunk/chef/debian/copyright 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/copyright 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,4 +1,4 @@
-This package was debianized by Joshua TImberman <joshua at opscode.com>
+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>
Modified: trunk/chef/debian/patches/fix_slice_dirs.patch
===================================================================
--- trunk/chef/debian/patches/fix_slice_dirs.patch 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/patches/fix_slice_dirs.patch 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,10 +1,10 @@
# 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
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef-server-slice/lib/chef-server-slice.rb 2009-08-06 00:25:23.000000000 -0600
++++ chef-0.7.8/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.
Modified: trunk/chef/debian/patches/remove_rubygems.patch
===================================================================
--- trunk/chef/debian/patches/remove_rubygems.patch 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/patches/remove_rubygems.patch 2009-08-12 22:07:26 UTC (rev 3925)
@@ -1,9 +1,9 @@
# 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
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef-server/bin/chef-indexer 2009-08-05 15:52:22.000000000 -0600
++++ chef-0.7.8/chef-server/bin/chef-indexer 2009-08-05 15:52:31.000000000 -0600
@@ -20,7 +20,6 @@
$: << File.join(File.dirname(__FILE__), "..", "lib")
@@ -14,10 +14,10 @@
-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
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef-server/bin/chef-server 2009-08-05 17:22:54.000000000 -0600
++++ chef-0.7.8/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
@@ -39,7 +39,7 @@
break
end
-+CHEF_SERVER_VERSION = "0.7.4" unless defined?(CHEF_SERVER_VERSION)
++CHEF_SERVER_VERSION = "0.7.8" unless defined?(CHEF_SERVER_VERSION)
+
# Ensure the chef gem we load is the same version as the chef server
unless defined?(Chef)
@@ -52,10 +52,10 @@
__DIR__ = Dir.getwd
if ARGV[0] && ARGV[0] =~ /^[^-]/
-Index: chef-0.7.4/chef-server/public/merb.fcgi
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef-server/public/merb.fcgi 2009-08-05 15:54:06.000000000 -0600
++++ chef-0.7.8/chef-server/public/merb.fcgi 2009-08-05 15:54:10.000000000 -0600
@@ -1,6 +1,5 @@
#!/usr/bin/env ruby
@@ -70,10 +70,10 @@
- :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
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef/bin/chef-client 2009-08-05 15:52:41.000000000 -0600
++++ chef-0.7.8/chef/bin/chef-client 2009-08-05 15:52:48.000000000 -0600
@@ -20,7 +20,6 @@
$: << File.join(File.dirname(__FILE__), "..", "lib")
@@ -84,10 +84,10 @@
-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
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef/bin/chef-solo 2009-08-05 15:52:54.000000000 -0600
++++ chef-0.7.8/chef/bin/chef-solo 2009-08-05 15:52:58.000000000 -0600
@@ -20,7 +20,6 @@
$: << File.join(File.dirname(__FILE__), "..", "lib")
@@ -96,10 +96,10 @@
require 'chef/application/solo'
Chef::Application::Solo.new.run
-Index: chef-0.7.4/chef/lib/chef.rb
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef/lib/chef.rb 2009-08-05 15:55:38.000000000 -0600
++++ chef-0.7.8/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__)))
@@ -108,10 +108,10 @@
require 'extlib'
require 'chef/exceptions'
require 'chef/log'
-Index: chef-0.7.4/chef/lib/chef/openid_registration.rb
+Index: chef-0.7.8/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
+--- chef-0.7.8.orig/chef/lib/chef/openid_registration.rb 2009-08-05 15:55:16.000000000 -0600
++++ chef-0.7.8/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'
Modified: trunk/chef/debian/rules
===================================================================
--- trunk/chef/debian/rules 2009-08-12 21:47:12 UTC (rev 3924)
+++ trunk/chef/debian/rules 2009-08-12 22:07:26 UTC (rev 3925)
@@ -30,7 +30,6 @@
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::
@@ -43,7 +42,6 @@
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
@@ -66,7 +64,6 @@
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::
More information about the Pkg-ruby-extras-commits
mailing list