[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 90c4a6028cf6ebd530af736ce08f1b413698b162

[Micah Anderson]

The following commit has been merged in the master branch:
commit 452d1a5836b0df17f194f2cec09d7312691e1f91
Author: Micah Anderson <micah at riseup.net>
Date:   Sat May 31 11:51:55 2008 -0400

    Changed default port to be consistent with the client default

diff --git a/debian/changelog b/debian/changelog
index a233f3d..c19c019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+puppet (0.24.4-8) unstable; urgency=low
+
+  * Changed the default port value to 8140 in /etc/default/puppetmaster
+    to be consistent with the client default port. (Closes: #483823)
+
+ -- Micah Anderson <micah at debian.org>  Sat, 31 May 2008 11:39:47 -0400
+
 puppet (0.24.4-7) unstable; urgency=low
   
   * Update emacs-mode with changes cherry-picked from rra's repository
diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
index f74ca77..4a1cad0 100644
--- a/debian/puppetmaster.default
+++ b/debian/puppetmaster.default
@@ -21,9 +21,16 @@ SERVERTYPE=webrick
 # higher than 1 if you are not using mongrel. 
 PUPPETMASTERS=1
 
-# What port should the puppetmaster listen on (default: 18140). If 
-# PUPPETMASTERS is set to a number greater than 1, then the port
-# for the first puppetmaster will be set to the below port, and further
-# instances will be incremented by one
-
-PORT=18140
+# 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

-- 
Puppet packaging for Debian