[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.1.rc3-1-41-g7bd836a

[Mathias Gug]

The following commit has been merged in the master branch:
commit 7bd836accf152bb9b651e0fa44a3d2d26fb8bcfa
Author: Mathias Gug <mathias.gug at canonical.com>
Date:   Mon Sep 20 14:13:06 2010 -0400

    Update sed regex to catch all occurence of SSLCARevocationFile.

diff --git a/debian/puppetmaster-passenger.postinst b/debian/puppetmaster-passenger.postinst
index f2bdf78..7298f20 100644
--- a/debian/puppetmaster-passenger.postinst
+++ b/debian/puppetmaster-passenger.postinst
@@ -45,7 +45,7 @@ if [ "$1" = "configure" ]; then
     # Fix CRL file on upgrade to use the CA crl file instead of the host crl.
     if dpkg --compare-versions "$2" lt-nl "2.6.1-1"; then
         if [ -e /etc/apache2/sites-available/puppetmaster ]; then
-            sed -i 's|SSLCARevocationFile /var/lib/puppet/ssl/crl.pem$|SSLCARevocationFile /var/lib/puppet/ssl/ca/ca_crl.pem|' /etc/apache2/sites-available/puppetmaster
+            sed -r -i 's|SSLCARevocationFile[[:space:]]+/var/lib/puppet/ssl/crl.pem$|SSLCARevocationFile /var/lib/puppet/ssl/ca/ca_crl.pem|' /etc/apache2/sites-available/puppetmaster
             if [ -x "/etc/init.d/apache2" ]; then
                 # Seems that a restart is needed. reload breaks ssl apparently.
                 if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then

-- 
Puppet packaging for Debian