Update more cookbooks

cookbooks/chef_nginx/recipes/commons_dir.rb

@@ -43,7 +43,7 @@ end
   end
 end
 
-if !node['nginx']['default_site_enabled'] && platform_family?('rhel', 'fedora')
+if !node['nginx']['default_site_enabled'] && platform_family?('rhel', 'fedora', 'amazon')
   %w(default.conf example_ssl.conf).each do |config|
     file "/etc/nginx/conf.d/#{config}" do
       action :delete

cookbooks/chef_nginx/recipes/pagespeed_module.rb

@@ -22,7 +22,7 @@ remote_file psol_src_filepath do
 end
 
 package_array = value_for_platform_family(
-  %w(rhel)   => node['nginx']['pagespeed']['packages']['rhel'],
+  %w(rhel amazon)   => node['nginx']['pagespeed']['packages']['rhel'],
   %w(debian) => node['nginx']['pagespeed']['packages']['debian']
 )
 

cookbooks/chef_nginx/recipes/passenger.rb

@@ -18,16 +18,12 @@
 #
 
 packages = value_for_platform_family(
-  %w(rhel) => node['nginx']['passenger']['packages']['rhel'],
+  %w(rhel amazon) => node['nginx']['passenger']['packages']['rhel'],
   %w(fedora) => node['nginx']['passenger']['packages']['fedora'],
   %w(debian) => node['nginx']['passenger']['packages']['debian']
 )
 
-unless packages.empty?
-  packages.each do |name|
-    package name
-  end
-end
+package packages unless packages.empty?
 
 gem_package 'rake' if node['nginx']['passenger']['install_rake']
 

cookbooks/chef_nginx/recipes/repo.rb

@@ -19,12 +19,12 @@
 #
 
 case node['platform_family']
-when 'rhel'
+when 'rhel', 'amazon'
 
   yum_repository 'nginx' do
     description  'Nginx.org Repository'
     baseurl      node['nginx']['upstream_repository']
-    gpgkey       'http://nginx.org/keys/nginx_signing.key'
+    gpgkey       node['nginx']['repo_signing_key']
     action       :create
   end
 
@@ -32,8 +32,8 @@ when 'suse'
 
   zypper_repo 'nginx' do
     repo_name 'Nginx.org Repository'
-    uri 'http://nginx.org/packages/sles/12'
-    key 'http://nginx.org/keys/nginx_signing.key'
+    uri node['nginx']['upstream_repository']
+    key node['nginx']['repo_signing_key']
   end
 
 when 'debian'
@@ -43,7 +43,7 @@ when 'debian'
     distribution node['lsb']['codename']
     components   %w(nginx)
     deb_src      true
-    key          'http://nginx.org/keys/nginx_signing.key'
+    key          node['nginx']['repo_signing_key']
   end
 
 else

cookbooks/chef_nginx/recipes/source.rb

@@ -21,7 +21,7 @@
 # limitations under the License.
 #
 
-raise "#{node['platform']} is not a supported platform in the nginx::source recipe" unless platform_family?('rhel', 'fedora', 'debian', 'suse')
+raise "#{node['platform']} is not a supported platform in the nginx::source recipe" unless platform_family?('rhel', 'amazon', 'fedora', 'debian', 'suse')
 
 node.normal['nginx']['binary'] = node['nginx']['source']['sbin_path']
 node.normal['nginx']['daemon_disable'] = true
@@ -42,7 +42,7 @@ src_filepath = "#{Chef::Config['file_cache_path']}/nginx-#{node['nginx']['source
 
 # install prereqs
 package value_for_platform_family(
-  %w(rhel fedora) => %w(pcre-devel openssl-devel tar),
+  %w(rhel fedora amazon) => %w(pcre-devel openssl-devel tar),
   %w(suse) => %w(pcre-devel libopenssl-devel tar),
   %w(debian) => %w(libpcre3 libpcre3-dev libssl-dev tar)
 )