[DRE-commits] r5973 - in trunk/chef/debian: . etc/chef patches
Joshua Timberman
jtimberman-guest at alioth.debian.org
Thu Nov 4 15:06:08 UTC 2010
Author: jtimberman-guest
Date: 2010-11-04 15:05:58 +0000 (Thu, 04 Nov 2010)
New Revision: 5973
Modified:
trunk/chef/debian/NEWS
trunk/chef/debian/changelog
trunk/chef/debian/chef-server-api.dirs
trunk/chef/debian/chef-server-api.postinst
trunk/chef/debian/chef-solr.dirs
trunk/chef/debian/chef.postinst
trunk/chef/debian/control
trunk/chef/debian/etc/chef/server.rb
trunk/chef/debian/patches/chef_server_load_path-2.patch
trunk/chef/debian/patches/series
trunk/chef/debian/patches/solr_load_path.patch
trunk/chef/debian/rules
Log:
Chef version 0.9.12 packaging updates
Modified: trunk/chef/debian/NEWS
===================================================================
--- trunk/chef/debian/NEWS 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/NEWS 2010-11-04 15:05:58 UTC (rev 5973)
@@ -1,3 +1,27 @@
+chef (0.9.12+dfsg-1) unstable; urgency=low
+
+ * When upgrading the chef-server from 0.9.8 or earlier versions in the
+ 0.9.x series, the package needs to be installed before the chef package
+ if the chef package is installed and the chef-client daemon is running
+ because the checksum_path setting in `/etc/chef/server.rb` conflicts
+ with the cache_options setting in `/etc/chef/client.rb`. A fixed bug
+ in Chef 0.9.10 causes the files in the checksum_path to be removed and
+ on the chef-server that is where the uploaded cookbooks are stored.
+ * The checksum clearing code (from 0.9.10) mentioned above may take a very
+ long time to execute depending on how many files have been stored in the
+ cache on the system. The default location is specified by the
+ cache_options setting in /etc/chef/client.rb. If there are a lot of
+ files in this directory then it may be desirable to delete the contents
+ of the directory before updating Chef.
+ * knife now (as of 0.9.10) has a new subcommand `exec` that can be used to
+ execute API commands similar to those used by shef. For more information
+ see the Shef wiki page (also listed in 0.9.8 news below).
+ * Resource notifications have been revamped to be more simple to use and
+ will work better overall. See the wiki page for complete syntax.
+ http://wiki.opscode.com/display/chef/Resources#Resources-Notifications
+
+ -- Joshua Timberman <joshua at opscode.com> Sat, 23 Oct 2010 09:06:54 -0600
+
chef (0.9.8+dfsg-1) unstable; urgency=low
Important changes in 0.9.8:
Modified: trunk/chef/debian/changelog
===================================================================
--- trunk/chef/debian/changelog 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/changelog 2010-11-04 15:05:58 UTC (rev 5973)
@@ -1,8 +1,21 @@
-chef (0.9.8+dfsg-4) unstable; urgency=low
+chef (0.9.12+dfsg-1) unstable; urgency=low
- * debian/rules: use upstream source's init scripts
+ * New upstream release (0.9.12).
+ * debian/control: Depend on ohai 0.5.8.
+ * debian/control: depend on mixlib-log 1.2.0 (fixes CHEF-1382).
+ * debian/rules: use upstream source's init scripts except chef-solr (need
+ + update for upstream to support retries)
+ * debian/patches/solr_load_path.patch: delete, use -3.
+ * debian/patches/solr_load_path-3.patch:
+ + upstream changed ordering in some of the Index files, rewrite the patch
+ + also account for version constant
+ * debian/etc/chef/server.rb:
+ + Resolve checksum_path setting conflict.
+ * debian/chef-server-api.postinst, debian/chef.postinst:
+ + handle checksum_path location change.
+ * debian/chef-server-api.dirs, add new cookbook_index directory.
- -- Joshua Timberman <joshua at opscode.com> Fri, 27 Aug 2010 12:49:58 -0600
+ -- Joshua Timberman <joshua at opscode.com> Tue, 12 Oct 2010 14:38:53 -0600
chef (0.9.8+dfsg-3) unstable; urgency=low
Modified: trunk/chef/debian/chef-server-api.dirs
===================================================================
--- trunk/chef/debian/chef-server-api.dirs 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/chef-server-api.dirs 2010-11-04 15:05:58 UTC (rev 5973)
@@ -1,5 +1,6 @@
var/cache/chef
var/lib/chef/cookbooks
+var/lib/chef/cookbook_index
var/log/chef
usr/share/doc/chef-server
usr/share/chef-server
Modified: trunk/chef/debian/chef-server-api.postinst
===================================================================
--- trunk/chef/debian/chef-server-api.postinst 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/chef-server-api.postinst 2010-11-04 15:05:58 UTC (rev 5973)
@@ -34,6 +34,9 @@
chown -R $USER:$GROUP /var/log/chef
chown -R $USER:$GROUP /var/cache/chef
chown -R $USER:$GROUP /var/run/chef
+ mkdir -p /var/lib/chef/cookbook_index
+ chown -R $USER:$GROUP /var/lib/chef/cookbook_index
+ find /var/cache/chef/checksums/ -depth -mindepth 1 -type d -exec mv {} /var/lib/chef/cookbook_index \;
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/chef/debian/chef-solr.dirs
===================================================================
--- trunk/chef/debian/chef-solr.dirs 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/chef-solr.dirs 2010-11-04 15:05:58 UTC (rev 5973)
@@ -7,6 +7,7 @@
var/lib/chef/solr/solr-jetty/solr/WEB-INF
var/cache/chef/solr/data
var/log/chef
+var/run/chef
etc/chef
etc/chef/solr-jetty
usr/sbin
Modified: trunk/chef/debian/chef.postinst
===================================================================
--- trunk/chef/debian/chef.postinst 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/chef.postinst 2010-11-04 15:05:58 UTC (rev 5973)
@@ -17,6 +17,8 @@
fi
ucf --debconf-ok $TMPFILE $CONFIGFILE
test -f $CONFIGFILE && chmod 0640 $CONFIGFILE
+ mkdir -p /var/lib/chef/cookbook_index
+ find /var/cache/chef/checksums/ -depth -mindepth 1 -type d -exec mv {} /var/lib/chef/cookbook_index \;
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/chef/debian/control
===================================================================
--- trunk/chef/debian/control 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/control 2010-11-04 15:05:58 UTC (rev 5973)
@@ -5,12 +5,12 @@
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, po-debconf, libjavascript-minifier-xs-perl
Build-Depends-Indep: ruby, rake
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://wiki.opscode.com/display/chef/Home
Package: chef
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, liberubis-ruby1.8, libjson-ruby1.8, libextlib-ruby1.8 (>= 0.9.13), ohai (>= 0.4.0), libchef-ruby1.8 (= ${source:Version}), libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.4), ucf, libhighline-ruby1.8
+Depends: ${misc:Depends}, ruby1.8, liberubis-ruby1.8, libjson-ruby1.8, libextlib-ruby1.8 (>= 0.9.13), ohai (>= 0.5.8), libchef-ruby1.8 (= ${source:Version}), libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.4), ucf, libhighline-ruby1.8
Recommends: irb1.8
Description: System integration framework written in Ruby
Chef is a systems integration framework and configuration management library
@@ -111,8 +111,8 @@
Package: libchef-ruby1.8
Architecture: all
-Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.4), libmixlib-cli-ruby1.8 (>= 1.1.0), libmixlib-config-ruby1.8 (>= 1.1.0), libmixlib-log-ruby1.8 (>= 1.1.0), libohai-ruby1.8 (>= 0.4.0), libmoneta-ruby1.8, libbunny-ruby1.8, rubygems1.8 | libgems-ruby1.8, librestclient-ruby1.8, libuuidtools-ruby1.8
-Recommends: ohai (>= 0.4.0), chef (= ${source:Version})
+Depends: ${misc:Depends}, ruby1.8, libopenssl-ruby1.8, libmixlib-authentication-ruby1.8 (>= 1.1.4), libmixlib-cli-ruby1.8 (>= 1.1.0), libmixlib-config-ruby1.8 (>= 1.1.0), libmixlib-log-ruby1.8 (>= 1.2.0), libohai-ruby1.8 (>= 0.5.8), libmoneta-ruby1.8, libbunny-ruby1.8, rubygems1.8 | libgems-ruby1.8, librestclient-ruby1.8, libuuidtools-ruby1.8
+Recommends: ohai (>= 0.5.8), chef (= ${source:Version})
Suggests: rake, libshadow-ruby1.8
Description: Ruby 1.8 libraries for Chef system integration framework
Chef is a systems integration framework and configuration management library
Modified: trunk/chef/debian/etc/chef/server.rb
===================================================================
--- trunk/chef/debian/etc/chef/server.rb 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/etc/chef/server.rb 2010-11-04 15:05:58 UTC (rev 5973)
@@ -56,12 +56,20 @@
#
# 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
+#
+# NOTE: cookbook_path is a deprecated setting for the Chef Server. This option
+# remains here for compatibility because the default in Chef is not FHS compliant.
+# This option may be removed in a future version.
cookbook_path [ "/var/lib/chef/cookbooks" ]
# cookbook_tarball_path is the location where the server will store uploaded
# cookbook tarballs. These tarballs can be downloaded with knife, for
# redistribution.
+#
+# NOTE: cookbook_tarball_path is a deprecated setting for the Chef Server.
+# This option remains here for compatibility because the default in Chef is
+# not FHS compliant. This option may be removed in a future version.
cookbook_tarball_path "/var/lib/chef/cookbook-tarballs"
@@ -70,6 +78,11 @@
sandbox_path "/var/cache/chef/sandboxes"
+# checksum_path sets the location for the checksum index for each cookbook
+# file uploaded.
+
+checksum_path "/var/lib/chef/cookbook_index"
+
# file_cache_path specifies where chef should cache cookbooks, server
# cookie ID, and openid registration data.
# valid value is any filesystem directory location.
@@ -118,10 +131,6 @@
cache_options({ :path => "/var/cache/chef/checksums", :skip_expires => true})
-# checksum_path sets the location for file checksums on sandbox uploads.
-
-checksum_path "/var/cache/chef/checksums"
-
# Mixlib::Log::Formatter.show_time specifies whether the chef-client log should
# contain timestamps.
# valid values are true or false. The printed timestamp is rfc2822, for example:
Modified: trunk/chef/debian/patches/chef_server_load_path-2.patch
===================================================================
--- trunk/chef/debian/patches/chef_server_load_path-2.patch 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/patches/chef_server_load_path-2.patch 2010-11-04 15:05:58 UTC (rev 5973)
@@ -1,26 +1,23 @@
# Description: fixes the chef-server daemons to disable Merb's json loading
# and sets the full path to the libraries for the merb apps for the api and
# webui. no plans for Upstream to change this.
-Index: chef-0.9.8+dfsg.orig/chef-server-api/bin/chef-server
+Index: chef-0.9.10.rc.3+dfsg.orig/chef-server-api/bin/chef-server
===================================================================
---- chef-0.9.8+dfsg.orig.orig/chef-server-api/bin/chef-server 2010-08-05 13:07:42.000000000 -0600
-+++ chef-0.9.8+dfsg.orig/chef-server-api/bin/chef-server 2010-08-10 00:43:45.000000000 -0600
-@@ -22,20 +22,20 @@
-
+--- chef-0.9.10.rc.3+dfsg.orig.orig/chef-server-api/bin/chef-server 2010-10-13 17:13:32.000000000 -0600
++++ chef-0.9.10.rc.3+dfsg.orig/chef-server-api/bin/chef-server 2010-10-13 17:14:48.000000000 -0600
+@@ -23,9 +23,11 @@
require "rubygems"
require "merb-core"
--
+
+Merb.disable(:json)
# Load chef and chef-server-api from source rather than gem, if present
$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/'))
$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
++$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../share/chef-server-api/lib'))
# Print the version if we have -v or --version
if ARGV.any? { |arg| arg =~ /\-v|\-\-version/ }
-- require 'chef-server-api/version'
-+ require '/usr/share/chef-server-api/lib/chef-server-api/version'
- puts "Chef Server (API) Version: #{ChefServerApi::VERSION}"
- exit 1
+@@ -35,7 +37,7 @@
end
require 'chef'
@@ -29,26 +26,23 @@
# Ensure the chef gem we load is the same version as the chef server
unless defined?(Chef)
-Index: chef-0.9.8+dfsg.orig/chef-server-webui/bin/chef-server-webui
+Index: chef-0.9.10.rc.3+dfsg.orig/chef-server-webui/bin/chef-server-webui
===================================================================
---- chef-0.9.8+dfsg.orig.orig/chef-server-webui/bin/chef-server-webui 2010-08-05 13:07:42.000000000 -0600
-+++ chef-0.9.8+dfsg.orig/chef-server-webui/bin/chef-server-webui 2010-08-10 00:44:34.000000000 -0600
-@@ -25,20 +25,20 @@
-
+--- chef-0.9.10.rc.3+dfsg.orig.orig/chef-server-webui/bin/chef-server-webui 2010-10-13 17:14:54.000000000 -0600
++++ chef-0.9.10.rc.3+dfsg.orig/chef-server-webui/bin/chef-server-webui 2010-10-13 17:15:25.000000000 -0600
+@@ -26,9 +26,11 @@
require "rubygems"
require "merb-core"
--
+
+Merb.disable(:json)
# Load chef and chef-server-api from source rather than gem, if present
$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib'))
$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
++$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../share/chef-server-webui/lib'))
# Print the version if we have -v or --version
if ARGV.any? { |arg| arg =~ /\-v|\-\-version/ }
-- require 'chef-server-webui/version'
-+ require '/usr/share/chef-server-webui/lib/chef-server-webui/version'
- puts "Chef Server (Web UI) Version: #{ChefServerWebui::VERSION}"
- exit 1
+@@ -38,7 +40,7 @@
end
require 'chef'
Modified: trunk/chef/debian/patches/series
===================================================================
--- trunk/chef/debian/patches/series 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/patches/series 2010-11-04 15:05:58 UTC (rev 5973)
@@ -1,3 +1,3 @@
+solr_loath_path-3.patch
chef_server_load_path-2.patch
-solr_load_path.patch
jquery_unminified.patch
Modified: trunk/chef/debian/patches/solr_load_path.patch
===================================================================
--- trunk/chef/debian/patches/solr_load_path.patch 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/patches/solr_load_path.patch 2010-11-04 15:05:58 UTC (rev 5973)
@@ -48,7 +48,7 @@
+++ chef-0.9.0/chef-server-api/lib/chef-server-api.rb 2010-06-28 17:51:21.000000000 -0600
@@ -1,2 +1,3 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "chef-solr", "lib")
- CHEF_SERVER_VERSION = "0.8.11"
+ CHEF_SERVER_VERSION = "0.9.10.rc.2"
CHEF_SERVER_API_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
Index: chef-0.9.0/chef-server-webui/lib/chef-server-webui.rb
===================================================================
@@ -56,5 +56,5 @@
+++ chef-0.9.0/chef-server-webui/lib/chef-server-webui.rb 2010-06-28 17:52:01.000000000 -0600
@@ -1,2 +1,3 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "chef-solr", "lib")
- CHEF_SERVER_WEBUI_VERSION = "0.8.11"
+ CHEF_SERVER_WEBUI_VERSION = "0.9.10.rc.2"
CHEF_SERVER_WEBUI_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
Modified: trunk/chef/debian/rules
===================================================================
--- trunk/chef/debian/rules 2010-11-04 07:39:31 UTC (rev 5972)
+++ trunk/chef/debian/rules 2010-11-04 15:05:58 UTC (rev 5973)
@@ -54,10 +54,9 @@
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
+ perl -pi -e "s#DAEMON=/usr/bin/chef-solr-indexer#DAEMON=/usr/sbin/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
@@ -72,6 +71,7 @@
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
+ perl -pi -e "s#DAEMON=/usr/bin/chef-server#DAEMON=/usr/sbin/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
@@ -88,6 +88,7 @@
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
+ perl -pi -e "s#DAEMON=/usr/bin/chef-server-webui#DAEMON=/usr/sbin/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
More information about the Pkg-ruby-extras-commits
mailing list