[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, squeeze-2.6.2, updated. 2.6.2-298-g0a3952f

[micah anderson]

These were pretty minor changes, but I think that they could make it
into squeeze... any seconds, or other things we might want to "squeeze"
in there?

micah

On Mon, 01 Nov 2010 23:29:13 +0000, "Micah Anderson" <micah at riseup.net> wrote:
> The following commit has been merged in the squeeze-2.6.2 branch:
> commit 1fc40afb2000b297f2cbb9eb2e83bd4b9ff8bf40
> Author: Micah Anderson <micah at riseup.net>
> Date:   Mon Nov 1 19:24:13 2010 -0400
> 
>     update documentation to match new section headings
> 
> diff --git a/debian/changelog b/debian/changelog
> index ae8abf4..2633651 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,6 +1,8 @@
>  puppet (2.6.2-2) UNRELEASED; urgency=low
>  
>    * Fix puppetqd initscript PID location
> +  * Fix /etc/default/puppetmaster comments to match new section headings
> +  * Fix puppetmaster/README.Debian to match new section headings
>  
>   -- Micah Anderson <micah at debian.org>  Mon, 01 Nov 2010 19:21:55 -0400
>  
> diff --git a/debian/puppetmaster.README.debian b/debian/puppetmaster.README.debian
> index 078111c..f915687 100644
> --- a/debian/puppetmaster.README.debian
> +++ b/debian/puppetmaster.README.debian
> @@ -18,7 +18,7 @@ the domain name in the SSL configuration to be yours).
>  Additionally, your puppet.conf on your puppetmaster will need the
>  following settings:
>  
> -[puppetmasterd]]
> +[master]
>  ssl_client_header = SSL_CLIENT_S_DN
>  ssl_client_verify_header = SSL_CLIENT_VERIFY
>  
> diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
> index 68c58f0..b0a9fe4 100644
> --- a/debian/puppetmaster.default
> +++ b/debian/puppetmaster.default
> @@ -52,7 +52,7 @@ PORT=8140
>  #  dbuser=puppet
>  #  dbpassword=xxxx
>  #  dblocation = /var/lib/puppet/storeconfigs.sqlite <-- only if using sqlite
> -#  [puppetmasterd]
> +#  [master]
>  #  async_storeconfigs = true
>  #
>  #  See: http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
> 
> -- 
> Puppet packaging for Debian
> 
> _______________________________________________
> Pkg-puppet-devel mailing list
> Pkg-puppet-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-puppet-devel

-- 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-puppet-devel/attachments/20101101/d0141b4c/attachment.pgp>