From d7015e9608286ec9a765ff3508bb34d45bc6c073 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Sun, 12 Feb 2012 18:42:29 -0500
Subject: [PATCH] update a few things

---
 .../additional-modules/nginx-www/manifests/init.pp  |  0
 .../additional-modules/nginx/templates/nginx.conf   |  4 ++++
 .../ruby-debian/manifests/init.pp                   | 10 ++++++++++
 shared/additional-modules/ruby/manifests/init.pp    |  1 +
 shared/lib/puppet/provider/gem/gem_install.rb       | 13 ++++++++++++-
 shared/lib/puppet/type/gem.rb                       |  4 ++++
 shared/modules/init_d/manifests/init.pp             |  3 +++
 7 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 shared/additional-modules/nginx-www/manifests/init.pp
 create mode 100644 shared/additional-modules/ruby-debian/manifests/init.pp
 create mode 100644 shared/modules/init_d/manifests/init.pp

diff --git a/shared/additional-modules/nginx-www/manifests/init.pp b/shared/additional-modules/nginx-www/manifests/init.pp
new file mode 100644
index 0000000..e69de29
diff --git a/shared/additional-modules/nginx/templates/nginx.conf b/shared/additional-modules/nginx/templates/nginx.conf
index 330d54c..663ef07 100644
--- a/shared/additional-modules/nginx/templates/nginx.conf
+++ b/shared/additional-modules/nginx/templates/nginx.conf
@@ -32,6 +32,10 @@ http {
     gzip_types      text/plain text/html text/css application/x-javascript text/xml
                     application/xml application/xml+rss text/javascript;
 
+    passenger_root /usr/local/ruby/lib/ruby/gems/1.9.1/gems/passenger-<%= version %>;
+    passenger_ruby /usr/local/ruby/bin/ruby;
+    passenger_max_pool_size 10;
+
     include /etc/nginx/fastcgi.conf;
     include /etc/nginx/sites-enabled/*;
 }
diff --git a/shared/additional-modules/ruby-debian/manifests/init.pp b/shared/additional-modules/ruby-debian/manifests/init.pp
new file mode 100644
index 0000000..1064721
--- /dev/null
+++ b/shared/additional-modules/ruby-debian/manifests/init.pp
@@ -0,0 +1,10 @@
+class ruby-debian {
+  $packages = [
+    'libyaml-dev', 'libreadline-dev', 'libssl-dev', 'libffi-dev',
+    'libncurses5-dev', 'libcurl4-openssl-dev',
+    'libxml2', 'libxml2-dev', 'libxslt1.1', 'libxslt1-dev'
+  ]
+
+  package { $packages: ensure => installed }
+}
+
diff --git a/shared/additional-modules/ruby/manifests/init.pp b/shared/additional-modules/ruby/manifests/init.pp
index 9c1ebd5..498e7c2 100644
--- a/shared/additional-modules/ruby/manifests/init.pp
+++ b/shared/additional-modules/ruby/manifests/init.pp
@@ -11,6 +11,7 @@ class ruby($version) {
   gem { 'bundler':
     require => Build_and_install[$name],
     path => $with_ruby_path,
+    options => '--pre',
     ensure => present
   }
 
diff --git a/shared/lib/puppet/provider/gem/gem_install.rb b/shared/lib/puppet/provider/gem/gem_install.rb
index 7747c9d..b3605ca 100644
--- a/shared/lib/puppet/provider/gem/gem_install.rb
+++ b/shared/lib/puppet/provider/gem/gem_install.rb
@@ -20,11 +20,22 @@ Puppet::Type.type(:gem).provide(:install) do
     if @resource[:version] && !@resource[:version].empty?
       version = " -v #{@resource[:version]}"
     end
+
     version
   end
 
+  def options
+    options = ''
+
+    if @resource[:options] && !@resource[:options].empty?
+      options = " #{@resource[:options]}"
+    end
+
+    options
+  end
+
   def gem_command(what)
-    command = %{bash -c 'PATH=#{@resource[:path]} gem #{what} #{@resource[:name]} #{version}'}
+    command = %{bash -c 'PATH=#{@resource[:path]} gem #{what} #{@resource[:name]} #{options} #{version}'}.tap { |o| p o }
     command
   end
 end
diff --git a/shared/lib/puppet/type/gem.rb b/shared/lib/puppet/type/gem.rb
index 483f5f8..c04cd02 100644
--- a/shared/lib/puppet/type/gem.rb
+++ b/shared/lib/puppet/type/gem.rb
@@ -14,5 +14,9 @@ Puppet::Type.newtype(:gem) do
   newparam(:path) do
     desc "The binary search path"
   end
+
+  newparam(:options) do
+    desc "Gem install options"
+  end
 end
 
diff --git a/shared/modules/init_d/manifests/init.pp b/shared/modules/init_d/manifests/init.pp
new file mode 100644
index 0000000..492937d
--- /dev/null
+++ b/shared/modules/init_d/manifests/init.pp
@@ -0,0 +1,3 @@
+define init_d($template) {
+
+}