[svn] r9763 - in /trunk/rpms/puppet: puppet-2.6.5_rackup.patch puppet.spec

Steve Huff shuff at vecna.org
Wed Mar 16 16:21:13 CET 2011


Author: shuff
Date: Wed Mar 16 15:21:12 2011
New Revision: 9763

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9763&view=rev
Log:
updated to puppet-2.6.6, added dependency on augeas-libs >= 0.8, additional improvements to rackup config for Passenger

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

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=9763&r1=9762&r2=9763&view=diff
==============================================================================
--- trunk/rpms/puppet/puppet-2.6.5_rackup.patch (original)
+++ trunk/rpms/puppet/puppet-2.6.5_rackup.patch Wed Mar 16 15:21:12 2011
@@ -22,46 +22,73 @@
          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 09:12:38.000000000 -0400
-@@ -3,57 +3,65 @@
-   ensure => directory,
-   mode => 0755,
++++ puppet-2.6.5/ext/rack/manifest.pp	2011-03-16 11:17:00.000000000 -0400
+@@ -1,59 +1,74 @@
+-
+-file { ["/etc/puppet/rack", "/etc/puppet/rack/public"]:
+-  ensure => directory,
+-  mode => 0755,
++File {
    owner => root,
+   group => root,
+-}
+-file { "/etc/puppet/rack/config.ru":
+-  ensure => present,
+-  source => "puppet:///modules/rack/config.ru",
+   mode => 0644,
+-  owner => puppet,
 -  group => root,
-+  group => root
- }
- file { "/etc/puppet/rack/config.ru":
-   ensure => present,
-   source => "puppet:///modules/rack/config.ru",
-   mode => 0644,
-   owner => puppet,
--  group => root,
-+  group => root
  }
 -file { "/etc/apache2/conf.d/puppetmasterd":
-+file { "/etc/httpd/conf.d/puppetmaster.conf":
-   ensure => present,
-   source => "puppet:///modules/rack/apache2.conf",
-   mode => 0644,
-   owner => root,
-   group => root,
+-  ensure => present,
+-  source => "puppet:///modules/rack/apache2.conf",
+-  mode => 0644,
+-  owner => root,
+-  group => root,
 -  require => [File["/etc/puppet/rack/config.ru"], File["/etc/puppet/rack/public"], Package["apache2"], Package["passenger"]],
 -  notify => Service["apache2"],
-+  require => [File["/etc/puppet/rack/config.ru"], File["/etc/puppet/rack/public"], Package["httpd"], Package["mod_passenger"]],
-+  notify => Service["httpd"]
++
++Service {
++  hasstatus => true,
++  hasrestart => true,
++}
++
++file { 
++  ["/etc/puppet/rack", "/etc/puppet/rack/public"]:
++    ensure => directory,
++    mode => 0755;
++  "/etc/puppet/rack/config.ru":
++    ensure => present,
++    source => "puppet:///modules/rack/config.ru",
++    mode => 0644,
++    owner => puppet;
++  "/etc/httpd/conf.d/puppetmaster.conf":
++    ensure => present,
++    source => "puppet:///modules/rack/apache2.conf",
++    require => [File["/etc/puppet/rack/config.ru"], File["/etc/puppet/rack/public"], Package["httpd"], Package["mod_passenger"]],
++    notify => Augeas["httpd_conf"];
 +}
 +if versioncmp($puppetversion, "2.6.0") < 0 {
 +  $master = "puppetmasterd"
 +} else {
 +  $master = "master"
 +}
-+augeas { "puppetmaster_ssl": 
-+  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"]
++augeas { 
++  "puppetmaster_ssl": 
++    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"];
++  "httpd_conf":
++    context => "/files/etc/httpd/conf.d/puppetmaster.conf/VirtualHost/",
++    changes => [
++      "set *[self::directive='SSLCertificateFile']/arg /var/lib/puppet/ssl/certs/${fqdn}.pem",
++      "set *[self::directive='SSLCertificateKeyFile']/arg /var/lib/puppet/ssl/private_keys/${fqdn}.pem",
++    ],
++    require => File["/etc/httpd/conf.d/puppetmaster.conf"],
++    notify => Service["httpd"];
  }
  
 -package { ["rack", "passenger"]:
@@ -72,15 +99,13 @@
  }
  
 -service { "apache2":
-+service { "httpd":
-+  hasstatus => "true",
-+  hasrestart => "true",
-+}
-+
-+service { "puppetmaster":
-+  require => Package["puppet-server"],
-+  ensure => "stopped",
-+  enable => "false"
++service { 
++  "httpd":
++    require => Package["httpd"];
++  "puppetmaster":
++    require => Package["puppet-server"],
++    ensure => "stopped",
++    enable => "false";
  }
  
  case $lsbdistid {
@@ -89,8 +114,7 @@
 +  "RedHat","CentOS","Fedora": {
 +    package { ["httpd", "httpd-devel", "mod_ssl"]:
        ensure => installed,
-+      provider => "yum"
-     }
+-    }
 -    file { "/etc/apache2/mods-enabled/ssl.load":
 -      ensure => "../mods-available/ssl.load",
 -      notify => Service["apache2"],
@@ -103,8 +127,7 @@
 -      subscribe => Package["passenger"],
 -      before => Service["apache2"],
 -      require => Package[["passenger", "apache2-threaded-dev"]],
-+    Service["httpd"] {
-+      require => Package["httpd"]
++      provider => "yum"
      }
    }
  }
@@ -114,5 +137,6 @@
 -notice("   LoadModule passenger_module /var/lib/gems/1.8/gems/passenger-2.2.2/ext/apache2/mod_passenger.so")
 -notice("   PassengerRoot /var/lib/gems/1.8/gems/passenger-2.2.2")
 -notice("   PassengerRuby /usr/bin/ruby1.8")
+-notice("--------------------------------------------------------")
 +notice("Puppet configuration for Phusion Passenger.")
- notice("--------------------------------------------------------")
++notice("-------------------------------------------")

Modified: trunk/rpms/puppet/puppet.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/puppet/puppet.spec?rev=9763&r1=9762&r2=9763&view=diff
==============================================================================
--- trunk/rpms/puppet/puppet.spec (original)
+++ trunk/rpms/puppet/puppet.spec Wed Mar 16 15:21:12 2011
@@ -2,6 +2,10 @@
 # Authority: shuff
 # ExcludeDist: el3 el4
 
+# we need Augeas >= 0.8 for Apache conf manipulation
+# el6 ships with 0.7.x
+%{?el6:# Tag: rfx}
+
 %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
 # no Ruby SELinux support in el5
@@ -12,7 +16,7 @@
 
 Summary: Network tool for managing many disparate systems
 Name: puppet
-Version: 2.6.5
+Version: 2.6.6
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -24,6 +28,7 @@
 BuildArch: noarch
 
 BuildRequires: ruby-devel >= 1.8.1
+Requires: augeas-libs >= 0.8
 Requires: facter >= 1.5
 Requires: ruby >= 1.8.1
 Requires: ruby(abi) = 1.8
@@ -218,6 +223,11 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Mar 16 2011 Steve Huff <shuff at vecna.org> - 2.6.6-1
+- Update to version 2.6.6.
+- Improvements to rackup config.
+- Require Augeas 0.8 for Apache config lens.
+
 * Mon Mar 07 2011 Steve Huff <shuff at vecna.org> - 2.6.5-1
 - Update to version 2.6.5.
 - Port rackup config from Debian to Red Hat.




More information about the commits mailing list