[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.0-2-119-g611c2bb

[Mathias Gug]

The following commit has been merged in the master branch:
commit c26d2890b746aa3ad341ff09009e6b78110f33aa
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Thu Aug 19 18:35:35 2010 -0400

    Enable ssl master options to run under passenger
    
    Enable ssl options so that the default configuration works out of the
    box under passenger. Set puppet as the owner of /var/lib/puppet/ so that
    the puppetmaster can create its .puppet directory when run under
    passenger.

diff --git a/debian/puppet-common.postinst b/debian/puppet-common.postinst
index d53600e..fe6bb7d 100644
--- a/debian/puppet-common.postinst
+++ b/debian/puppet-common.postinst
@@ -11,6 +11,11 @@ if [ "$1" = "configure" ]; then
 			puppet
 	fi
 
+	# Change the ownership of /var/lib/puppet so that puppet daemons 
+	# can create ~/.puppet when run under the puppet user 
+	# (ex: under passenger).
+	chown puppet:puppet /var/lib/puppet
+
 	# Create folders common to "puppet" and "puppetmaster", which need
 	# to be owned by the "puppet" user
 	install --owner puppet --group puppet --directory \
diff --git a/debian/puppet.conf b/debian/puppet.conf
index 1d040a9..b18fae3 100644
--- a/debian/puppet.conf
+++ b/debian/puppet.conf
@@ -7,3 +7,10 @@ factpath=$vardir/lib/facter
 templatedir=$confdir/templates
 prerun_command=/etc/puppet/etckeeper-commit-pre
 postrun_command=/etc/puppet/etckeeper-commit-post
+
+[master]
+# These are needed when the puppetmaster is run by passenger
+# and can safely be removed if webrick is used.
+ssl_client_header = SSL_CLIENT_S_DN 
+ssl_client_verify_header = SSL_CLIENT_VERIFY
+

-- 
Puppet packaging for Debian