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

[Micah Anderson]

The following commit has been merged in the master branch:
commit 93a3ed1e3b70fe394f7ac96c235d527347ad57d2
Author: Micah Anderson <micah at riseup.net>
Date:   Tue Mar 16 12:37:40 2010 -0400

    install the config.ru necessary for easy rack setup. provide a puppetmaster.README, suggest librack-ruby and libapache2-mod-passenger and provide an example apache2.conf

diff --git a/debian/changelog b/debian/changelog
index 70d0efa..c4553cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-puppet (0.25.4-3) UNRELEASED; urgency=low
+puppet (0.25.4-4) UNRELEASED; urgency=low
 
   [ Stig Sandbeck Mathisen ]
   * Fix "puppetmaster and puppet scripts always return 0" with patch from
@@ -6,8 +6,12 @@ puppet (0.25.4-3) UNRELEASED; urgency=low
 
   [ Micah Anderson ]
   * Disable default puppet.conf option pluginsync=true, see puppet-common.NEWS
+  * Suggest in puppetmaster package: libapache2-mod-passenger, librack-ruby
+  * Create puppetmaster.README with information about the server type
+  * Provide an example apache2.conf for libapache2-mod-passenger
+  * Ship the rack config.ru, and README as README.rack
 
- -- Micah Anderson <micah at debian.org>  Mon, 15 Mar 2010 18:04:17 -0400
+ -- Micah Anderson <micah at debian.org>  Tue, 16 Mar 2010 12:27:07 -0400
 
 puppet (0.25.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fb26f99..9c32d67 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Architecture: all
 Depends: ${misc:Depends}, ruby1.8, puppet-common (= ${source:Version}), facter, lsb-base
 Conflicts: puppet (<< 0.24.7-1)
 Recommends: rails (>= 1.2.3-2), rdoc, libldap-ruby1.8
-Suggests: apache2 | nginx, mongrel, puppet-el, vim-puppet
+Suggests: apache2 | nginx, mongrel, puppet-el, vim-puppet, libapache2-mod-passenger, librack-ruby
 Description: centralised configuration management control daemon
  Puppet lets you centrally manage every important aspect of your system
  using a cross-platform specification language that manages all the
diff --git a/debian/puppetmaster.README.debian b/debian/puppetmaster.README.debian
new file mode 100644
index 0000000..8114730
--- /dev/null
+++ b/debian/puppetmaster.README.debian
@@ -0,0 +1,18 @@
+By default, the puppetmaster package is configured in
+/etc/default/puppetmaster to utilize the webrick server included in
+the application. This server is single-threaded, very slow and tends
+to fall over when you get close to 30 nodes. You will start to see
+connection-reset or End-of-file errors when this happens.
+
+You will want to a server that can scale better than webrick, such as
+Passenger (aka. mod_rails), or mongrel, both with a front-end
+web-proxy such as apache.
+
+If you would like to run Passenger (aka. mod_rails) with apache or
+mongrel, then you will need to make sure you have
+libapache2-mod-passenger and librack-ruby installed and you should
+have a look at the /usr/share/doc/puppetmaster/examples/apache2.conf
+for some reasonable settings to get you started.
+
+For more information:
+http://projects.reductivelabs.com/projects/puppet/wiki/Using_Passenger
diff --git a/debian/puppetmaster.dirs b/debian/puppetmaster.dirs
index 236670a..6655cc9 100644
--- a/debian/puppetmaster.dirs
+++ b/debian/puppetmaster.dirs
@@ -1 +1,5 @@
 usr/sbin
+usr/share/puppet/rack/puppetmasterd
+usr/share/puppet/rack/puppetmasterd/public
+usr/share/puppet/rack/puppetmasterd/tmp
+
diff --git a/debian/puppetmaster.examples b/debian/puppetmaster.examples
new file mode 100644
index 0000000..d931afe
--- /dev/null
+++ b/debian/puppetmaster.examples
@@ -0,0 +1 @@
+ext/rack/files/apache2.conf
diff --git a/debian/rules b/debian/rules
index 50298af..16294ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,16 @@ install: build
 	$(INSTALL) -m0644 ext/emacs/puppet-mode.el			\
 		$(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
 
+	# Install the rack README as README.rack
+	$(INSTALL) -m0644 ext/rack/README
+		$(CURDIR)/debian/puppetmaster/usr/share/doc/puppetmaster/README.rack
+	# Install the config.ru and the necessary helper directories
+	$(INSTALL) -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd
+	$(INSTALL) -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd/public
+	$(INSTALL) -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd/tmp
+	$(INSTALL) -m0644 -o puppet -g puppet ext/rack/files/config.ru \
+		$(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd
+
 	dh_installexamples examples/*
 
 	# Logcheck rules.  Gee I wish you could specify a file to source

-- 
Puppet packaging for Debian