[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.7-1-2-g8c2b56a

[Micah Anderson]

The following commit has been merged in the master branch:
commit 3c7716db1d754559d2258df72943c87fc13a0e23
Author: Micah Anderson <micah at riseup.net>
Date:   Mon Apr 11 11:37:35 2011 -0400

    fix #620635

diff --git a/debian/changelog b/debian/changelog
index 2ed034f..3e0263e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+puppet (2.6.7-2) unstable; urgency=medium
+
+  * Fix puppetmaster-passenger.postinst to get proper ssl configs (Closes: #620635)
+
+ -- Micah Anderson <micah at debian.org>  Mon, 11 Apr 2011 11:31:23 -0400
+
 puppet (2.6.7-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/puppetmaster-passenger.postinst b/debian/puppetmaster-passenger.postinst
index 7298f20..c5cb98c 100644
--- a/debian/puppetmaster-passenger.postinst
+++ b/debian/puppetmaster-passenger.postinst
@@ -25,11 +25,11 @@ if [ "$1" = "configure" ]; then
         if  [ ! -e "${APACHE2_SITE_FILE}" ]; then
             cp /usr/share/puppetmaster-passenger/apache2.site.conf.tmpl "${APACHE2_SITE_FILE}"
             # Fix path to SSL files
-            sed -r -i "s|(SSLCertificateFile\s+).+$|\1$(puppetca --configprint hostcert)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCertificateKeyFile\s+).+$|\1$(puppetca --configprint hostprivkey)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCACertificateFile\s+).+$|\1$(puppetca --configprint localcacert)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCertificateChainFile\s+).+$|\1$(puppetca --configprint localcacert)|" "${APACHE2_SITE_FILE}"
-            sed -r -i "s|(SSLCARevocationFile\s+).+$|\1$(puppetca --configprint cacrl)|" "${APACHE2_SITE_FILE}"
+            sed -r -i "s|(SSLCertificateFile\s+).+$|\1$(puppet --configprint hostcert)|" "${APACHE2_SITE_FILE}"
+            sed -r -i "s|(SSLCertificateKeyFile\s+).+$|\1$(puppet --configprint hostprivkey)|" "${APACHE2_SITE_FILE}"
+            sed -r -i "s|(SSLCACertificateFile\s+).+$|\1$(puppet --configprint localcacert)|" "${APACHE2_SITE_FILE}"
+            sed -r -i "s|(SSLCertificateChainFile\s+).+$|\1$(puppet --configprint localcacert)|" "${APACHE2_SITE_FILE}"
+            sed -r -i "s|(SSLCARevocationFile\s+).+$|\1$(puppet --configprint cacrl)|" "${APACHE2_SITE_FILE}"
         fi
         a2enmod ssl
         a2ensite puppetmaster

-- 
Puppet packaging for Debian