[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-2-29-gc8ccd7b

[Micah Anderson]

The following commit has been merged in the master branch:
commit c8ccd7bbe277e441cb7a0df17304253ffc3445ef
Author: Micah Anderson <micah at riseup.net>
Date:   Mon Apr 26 12:02:42 2010 -0400

    clarify how the default/puppetmaster should be configured for passenger setups

diff --git a/debian/changelog b/debian/changelog
index a761753..9eeba5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 puppet (0.25.4-6) unstable; urgency=low
 
+  * clarify passenger options in default/puppetmaster 
   * add patch to ext/rack/files/apache2.conf for debian-specific settings
   * debian/control: add version depends on librack-ruby
   * additional start-stop-daemon fix for puppet.init and puppetqd.init
diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
index dab64f7..68c58f0 100644
--- a/debian/puppetmaster.default
+++ b/debian/puppetmaster.default
@@ -1,6 +1,7 @@
 # Defaults for puppetmaster - sourced by /etc/init.d/puppetmaster
 
-# Start puppetmaster on boot?
+# Start puppetmaster on boot? If you are using passenger, you should
+# have this set to "no"
 START=yes
 
 # Startup options
@@ -8,13 +9,14 @@ DAEMON_OPTS=""
 
 # What server type to run 
 # Options: 
-# 	   webrick (default, cannot handle more than ~30 nodes)
-#	   mongrel (scales better than webrick because you can run
+# 	   webrick: default, cannot handle more than ~30 nodes
+#	   mongrel: scales better than webrick because you can run
 #	    	    multiple processes if you are getting
 #	    	    connection-reset or End-of-file errors, switch to
 #	    	    mongrel. Requires front-end web-proxy such as
-#	    	    apache, nginx, or pound)
-#	   See: http://reductivelabs.com/trac/puppet/wiki/UsingMongrel
+#	    	    apache, nginx, or pound, more information:
+#	            http://reductivelabs.com/trac/puppet/wiki/UsingMongrel
+#          passenger: no need to set this, be sure to set START=no above
 SERVERTYPE=webrick
 
 # How many puppetmaster instances to start? Its pointless to set this

-- 
Puppet packaging for Debian