Merge pull request #39 from ryanfitz/amazon

Amazon Linux support
This commit is contained in:
James Fryman 2013-01-22 19:34:29 -08:00
commit 6d2be4800d
4 changed files with 29 additions and 3 deletions

View file

@ -24,6 +24,12 @@ class nginx::package {
before => Anchor['nginx::package::end'], before => Anchor['nginx::package::end'],
} }
} }
amazon: {
class { 'nginx::package::amazon':
require => Anchor['nginx::package::begin'],
before => Anchor['nginx::package::end'],
}
}
debian,ubuntu: { debian,ubuntu: {
class { 'nginx::package::debian': class { 'nginx::package::debian':
require => Anchor['nginx::package::begin'], require => Anchor['nginx::package::begin'],

View file

@ -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,
}
}

View file

@ -52,7 +52,7 @@ class nginx::params {
$nx_daemon_user = $::operatingsystem ? { $nx_daemon_user = $::operatingsystem ? {
/(?i-mx:debian|ubuntu)/ => 'www-data', /(?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" # Service restart after Nginx 0.7.53 could also be just "/path/to/nginx/bin -s HUP"

View file

@ -3,9 +3,9 @@
<%= key %> <%= value %>; <%= key %> <%= value %>;
<% end -%><% end -%> <% end -%><% end -%>
root <%= www_root %>; root <%= www_root %>;
<% if has_variable?("try_files") then %> <% if @try_files -%>
try_files <% try_files.each do |try| -%> <%= try %> <% end -%>; try_files <% try_files.each do |try| -%> <%= try %> <% end -%>;
<% end %> <% end -%>
index <% index_files.each do |i| %> <%= i %> <% end %>; index <% index_files.each do |i| %> <%= i %> <% end %>;
<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%> <% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
<%= key %> <%= value %>; <%= key %> <%= value %>;