[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 75a6138bc21dd394878a01ee5bbbc7006541d63d
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Thu Aug 19 19:56:29 2010 -0400

    Install config.ru and apache2 site template
    
    Actually install config.ru and apache2 site template into
    puppetmaster-passenger directories.

diff --git a/debian/rules b/debian/rules
index e1fa328..065fe6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,13 +75,13 @@ install: build
 
 	# 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) -d -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd
-	$(INSTALL) -d -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd/public
-	$(INSTALL) -d -m0755 $(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd/tmp
+		$(CURDIR)/debian/puppetmaster-passenger/usr/share/doc/puppetmaster-passenger/README.rack
+	# Install the config.ru
 	$(INSTALL) -m0644 ext/rack/files/config.ru \
-		$(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd
+		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppet/rack/puppetmasterd
+	# Install apache2 site configuration template
+	$(INSTALL) -m0644 ext/rack/files/apache2.conf \
+		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppetmaster-passenger/apache2.site.conf.tmpl
 
 	dh_installexamples -p puppet-common examples/*
 

-- 
Puppet packaging for Debian