From 884777290a39260aee17a9f152007905b2b3e8f4 Mon Sep 17 00:00:00 2001
From: Ryan Fitzgerald <ryan@codebrewstudios.com>
Date: Tue, 22 Jan 2013 12:09:51 -0500
Subject: [PATCH 1/3] adding in suport of amazon linux

---
 manifests/package.pp        |  7 ++++++-
 manifests/package/amazon.pp | 20 ++++++++++++++++++++
 manifests/params.pp         |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 manifests/package/amazon.pp

diff --git a/manifests/package.pp b/manifests/package.pp
index e0090e122..cd6289b88 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -23,7 +23,12 @@
         require => Anchor['nginx::package::begin'],
         before  => Anchor['nginx::package::end'],
       }
-    }
+    amazon: {
+      class { 'nginx::package::amazon':
+        require => Anchor['nginx::package::begin'],
+        before  => Anchor['nginx::package::end'],
+      }
+    }   }
     debian,ubuntu: {
       class { 'nginx::package::debian': 
         require => Anchor['nginx::package::begin'],
diff --git a/manifests/package/amazon.pp b/manifests/package/amazon.pp
new file mode 100644
index 000000000..d4fb82314
--- /dev/null
+++ b/manifests/package/amazon.pp
@@ -0,0 +1,20 @@
+# Class: nginx::package::amazon
+#
+# This module manages NGINX package installation on ec2 amazon linux  based systems
+#
+# Parameters:
+#
+# There are no default parameters for this class.
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+# This class file is not called directly
+class nginx::package::amazon {
+  package { 'nginx':
+    ensure => present,
+  }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index dfdadfb67..95a4034dc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -52,7 +52,7 @@
 
   $nx_daemon_user = $::operatingsystem ? {
     /(?i-mx:debian|ubuntu)/                                      => 'www-data',
-    /(?i-mx:fedora|rhel|redhat|centos|scientific|suse|opensuse)/ => 'nginx',
+    /(?i-mx:fedora|rhel|redhat|centos|scientific|suse|opensuse|amazon)/ => 'nginx',
   }
 
   # Service restart after Nginx 0.7.53 could also be just "/path/to/nginx/bin -s HUP"

From 73f43293f7974a09ef491bc2b085f622de34e984 Mon Sep 17 00:00:00 2001
From: Ryan Fitzgerald <ryan@codebrewstudios.com>
Date: Tue, 22 Jan 2013 13:07:16 -0500
Subject: [PATCH 2/3] fixing syntax error

---
 manifests/package.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/package.pp b/manifests/package.pp
index cd6289b88..9eb888f3e 100644
--- a/manifests/package.pp
+++ b/manifests/package.pp
@@ -23,12 +23,13 @@
         require => Anchor['nginx::package::begin'],
         before  => Anchor['nginx::package::end'],
       }
+    }
     amazon: {
       class { 'nginx::package::amazon':
         require => Anchor['nginx::package::begin'],
         before  => Anchor['nginx::package::end'],
       }
-    }   }
+    }
     debian,ubuntu: {
       class { 'nginx::package::debian': 
         require => Anchor['nginx::package::begin'],

From a5b7258f63a2f870aecec7809f60a57651b3a55d Mon Sep 17 00:00:00 2001
From: Ryan Fitzgerald <ryan@wantworthy.com>
Date: Tue, 22 Jan 2013 18:28:06 +0000
Subject: [PATCH 3/3] fixing vhost template

---
 templates/vhost/vhost_location_directory.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/vhost/vhost_location_directory.erb b/templates/vhost/vhost_location_directory.erb
index f73fa11d4..c51cac580 100644
--- a/templates/vhost/vhost_location_directory.erb
+++ b/templates/vhost/vhost_location_directory.erb
@@ -3,9 +3,9 @@
     <%= key %> <%= value %>;
 <% end -%><% end -%>
     root  <%= www_root %>;
-    <% if has_variable?("try_files") then %>
+    <% if @try_files -%>
     try_files <% try_files.each do |try| -%> <%= try %> <% end -%>;
-    <% end %>
+    <% end -%>
     index <% index_files.each do |i| %> <%= i %> <% end %>; 
 <% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
     <%= key %> <%= value %>;