[DRE-maint] Bug#736394: [RFR] templates://chef/{chef.templates}

[Justin B Rye]

Christian PERRIER wrote:
>  Template: chef/chef_server_url

All looks good.

In the control file:

> -Description: clients for the chef systems integration framework
> +Description: Chef systems integration framework - clients
> 
> Debatable as there is only one binary package but I guess that "Chef"
> coming first is better. And capitalize it as this seem to be the way
> this is done upstream.

(Back in the days when the synopsis was 120 characters long I
suggested something completely different:
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705657#10
but this is okay.)
 
>   Chef is a systems integration framework and configuration management library
>   written in Ruby. Chef provides a Ruby library and API that can be used to
>   bring the benefits of configuration management to an entire infrastructure.

Ah, one of those webby so-called-APIs that has nothing to do with
Application Programming, or indeed code development of any sort... but
it's far too late to fix that.

> @@ -46,5 +46,5 @@
>   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, chef-solo and knife binaries as well
> + This package provides the chef-client, chef-solo and knife binaries as well
>   as the chef library.
> 
> s/contains/provides: dle style..:-)

Well, if we're editing that line, let's give it a "Harvard comma".
Oh, and the library is either "chef.rb" or "Chef".

    This package provides the chef-client, chef-solo, and knife binaries as well
    as the Chef library.

But if this provides the client, it seems to me that the description
and/or dependencies ought to give some hint about what package I
should install to get a server.  Is it chef-server-api?
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
-------------- next part --------------
Template: chef/chef_server_url
Type: string
_Description: URL of Chef server
 Please choose the full URI that clients will use to connect to the
 server (for instance: http://chef.example.com:4000).
 .
 This setting will be stored in /etc/chef/client.rb as
 "chef_server_url".
-------------- next part --------------
Source: chef
Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Tollef Fog Heen <tfheen at debian.org>
Build-Depends: debhelper (>= 8.2), gem2deb (>= 0.2.13~), po-debconf
Standards-Version: 3.9.5
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/chef.git
Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/chef.git;a=summary
Homepage: http://wiki.opscode.com/display/chef
XS-Ruby-Versions: all

Package: chef
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
Depends:
 chef-zero (>= 1.6.2),
 erubis (>= 2.7),
 ohai (>= 6),
 ruby | ruby-interpreter,
 ruby-diff-lcs (>= 1.2.4),
 ruby-highline (>= 1.6.9),
 ruby-json (>= 1.4.4),
 ruby-mixlib-authentication (>= 1.3),
 ruby-mixlib-cli (>= 1.3),
 ruby-mixlib-config (>= 2),
 ruby-mixlib-log (>= 1.3),
 ruby-mixlib-shellout (>= 1.2),
 ruby-net-ssh (>= 1:2.6),
 ruby-net-ssh-multi (>= 1.1),
 ruby-rest-client (<< 1.7.0),
 ruby-rest-client (>= 1.0.4),
 ruby-yajl (>= 1.1),
 ucf,
 ${misc:Depends},
 ${shlibs:Depends}
Provides: libchef-ruby, libchef-ruby1.8
Conflicts: libchef-ruby (<< 0.10.10-1~), libchef-ruby1.8 (<< 0.10.10-1~)
Replaces: libchef-ruby (<< 0.10.10-1~), libchef-ruby1.8 (<< 0.10.10-1~)
Breaks: chef-solr (<< 11)
Description: Chef systems integration framework - clients
 Chef is a systems integration framework and configuration management library
 written in Ruby. Chef provides a Ruby library and API that can be used to
 bring the benefits of configuration management to an entire infrastructure.
 .
 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 provides the chef-client, chef-solo, and knife binaries as well
 as the Chef library.
-------------- next part --------------
diff -ru chef-11.8.2.pristine/debian/chef.templates chef-11.8.2/debian/chef.templates
--- chef-11.8.2.pristine/debian/chef.templates	2013-06-10 23:55:25.000000000 +0100
+++ chef-11.8.2/debian/chef.templates	2014-01-31 19:37:20.207936686 +0000
@@ -1,7 +1,8 @@
 Template: chef/chef_server_url
 Type: string
-_Description: URL of Chef Server (e.g., http://chef.example.com:4000):
-  This is the full URI that clients will use to connect to the
-  server.
-  .
-  This will be used in /etc/chef/client.rb as 'chef_server_url'.
+_Description: URL of Chef server
+ Please choose the full URI that clients will use to connect to the
+ server (for instance: http://chef.example.com:4000).
+ .
+ This setting will be stored in /etc/chef/client.rb as
+ "chef_server_url".
diff -ru chef-11.8.2.pristine/debian/control chef-11.8.2/debian/control
--- chef-11.8.2.pristine/debian/control	2014-01-16 15:58:46.000000000 +0000
+++ chef-11.8.2/debian/control	2014-01-31 19:42:14.499335307 +0000
@@ -38,7 +38,7 @@
 Conflicts: libchef-ruby (<< 0.10.10-1~), libchef-ruby1.8 (<< 0.10.10-1~)
 Replaces: libchef-ruby (<< 0.10.10-1~), libchef-ruby1.8 (<< 0.10.10-1~)
 Breaks: chef-solr (<< 11)
-Description: clients for the chef systems integration framework
+Description: Chef systems integration framework - clients
  Chef is a systems integration framework and configuration management library
  written in Ruby. Chef provides a Ruby library and API that can be used to
  bring the benefits of configuration management to an entire infrastructure.
@@ -46,5 +46,5 @@
  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, chef-solo and knife binaries as well
- as the chef library.
+ This package provides the chef-client, chef-solo, and knife binaries as well
+ as the Chef library.