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

Andrew Pollock apollock at debian.org
Fri Apr 16 04:22:25 UTC 2010


The following commit has been merged in the master branch:
commit 48236201484fce752e0b65e43628b54861a270c4
Author: Andrew Pollock <apollock at debian.org>
Date:   Thu Apr 15 21:20:43 2010 -0700

    Don't install config.ru as owned by the puppet user
    
    Fixes #577366
    It's pointless anyway, as debhelper goes and resets it to root.

diff --git a/debian/changelog b/debian/changelog
index 85a6a2c..10aa479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-puppet (0.25.4-4) UNRELEASED; urgency=low
+puppet (0.25.4-4) unstable; urgency=low
 
   [ Andrew Pollock ]
   * debian/watch: update for new upstream location
@@ -13,7 +13,11 @@ puppet (0.25.4-4) UNRELEASED; urgency=low
     the rails 'max pool size' (redmine: #2568)
   * fix puppetqd initscript status operation 
 
- -- Micah Anderson <micah at debian.org>  Sun, 04 Apr 2010 22:24:05 -0400
+  [ Andrew Pollock ]
+  * debian/rules: don't install config.ru owned by the puppet user (closes:
+    #577366)
+
+ -- Andrew Pollock <apollock at debian.org>  Thu, 15 Apr 2010 21:18:32 -0700
 
 puppet (0.25.4-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index a9edcf6..317bc40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ install: build
 	$(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
-	$(INSTALL) -m0644 -o puppet -g puppet ext/rack/files/config.ru \
+	$(INSTALL) -m0644 ext/rack/files/config.ru \
 		$(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd
 
 	dh_installexamples examples/*

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list