Adding comments on /etc/default/puppetmaster

diff --git a/files/etc/default/puppetmaster b/files/etc/default/puppetmaster
index 55f4241b798e7c50ed8b42d38159ccd0c1e05da0..23a7dfdc3696a4166f0d4f90449edfe272942b82 100644 (file)
--- a/files/etc/default/puppetmaster
+++ b/files/etc/default/puppetmaster
@@ -1,6 +1,40 @@
-# Puppetmaster + Mongrel
+# Defaults for puppetmaster - sourced by /etc/init.d/puppetmaster
+
+# Start puppet on boot?
 START=yes
+
+# Startup options
+#DAEMON_OPTS=""
+DAEMON_OPTS="--ssl_client_header=HTTP_X_SSL_SUBJECT"
+
+# What server type to run 
+# Options: 
+#          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
+#SERVERTYPE=webrick
 SERVERTYPE=mongrel
+
+# How many puppetmaster instances to start? Its pointless to set this
+# higher than 1 if you are not using mongrel. 
+#PUPPETMASTERS=1
 PUPPETMASTERS=4
+
+# What port should the puppetmaster listen on (default: 8140). If
+# PUPPETMASTERS is set to a number greater than 1, then the port for
+# the first puppetmaster will be set to the port listed below, and
+# further instances will be incremented by one 
+#
+# NOTE: if you are using mongrel, then you will need to have a
+# front-end web-proxy (such as apache, nginx, pound) that takes
+# incoming requests on the port your clients are connecting to
+# (default is: 8140), and then passes them off to the mongrel
+# processes.  In this case it is recommended to run your web-proxy on
+# port 8140 and change the below number to something else, such as
+# 18140.
+#PORT=8140
 PORT=18140
-DAEMON_OPTS="--ssl_client_header=HTTP_X_SSL_SUBJECT"