[svn] r9760 - /trunk/rpms/puppet/puppet-2.6.5_rackup.patch

Steve Huff shuff at vecna.org
Mon Mar 14 14:03:21 CET 2011


Author: shuff
Date: Mon Mar 14 13:03:21 2011
New Revision: 9760

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9760&view=rev
Log:
fixing Passenger integration (missing SSL configuration directives)

Modified:
    trunk/rpms/puppet/puppet-2.6.5_rackup.patch

Modified: trunk/rpms/puppet/puppet-2.6.5_rackup.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/puppet/puppet-2.6.5_rackup.patch?rev=9760&r1=9759&r2=9760&view=diff
==============================================================================
--- trunk/rpms/puppet/puppet-2.6.5_rackup.patch (original)
+++ trunk/rpms/puppet/puppet-2.6.5_rackup.patch Mon Mar 14 13:03:21 2011
@@ -22,8 +22,8 @@
          SSLOptions +StdEnvVars
 diff -Naur puppet-2.6.5-orig/ext/rack/manifest.pp puppet-2.6.5/ext/rack/manifest.pp
 --- puppet-2.6.5-orig/ext/rack/manifest.pp	2011-02-28 18:33:01.000000000 -0500
-+++ puppet-2.6.5/ext/rack/manifest.pp	2011-03-14 08:50:33.000000000 -0400
-@@ -3,57 +3,63 @@
++++ puppet-2.6.5/ext/rack/manifest.pp	2011-03-14 08:59:17.000000000 -0400
+@@ -3,57 +3,65 @@
    ensure => directory,
    mode => 0755,
    owner => root,
@@ -50,21 +50,21 @@
 +  require => [File["/etc/puppet/rack/config.ru"], File["/etc/puppet/rack/public"], Package["httpd"], Package["mod_passenger"]],
 +  notify => Service["httpd"]
  }
++if versioncmp($puppetversion, "2.6.0") < 0 {
++  $master = "puppetmasterd"
++} else {
++  $master = "master"
++}
 +augeas { "puppetmaster_ssl": 
-+  if versioncmp($puppetversion, "2.6.0") < 0 {
-+    $master = "puppetmasterd"
-+  } else {
-+    $master = "master"
-+  }
 +  context => "/files/etc/puppet/puppet.conf/$master",
 +  changes => [
 +    "set ssl_client_header SSL_CLIENT_S_DN",
 +    "set ssl_client_verify_header SSL_CLIENT_VERIFY"
 +  ],
 +  require => Package["puppet-server"]
-+
  
 -package { ["rack", "passenger"]:
++
 +package { ["rubygem-rack", "mod_passenger", "puppet-server"]:
    ensure => installed,
 -  provider => "gem",
@@ -73,6 +73,8 @@
  
 -service { "apache2":
 +service { "httpd":
++  hasstatus => "yes",
++  hasrefresh => "yes",
 +}
 +
 +service { "puppetmaster":




More information about the commits mailing list