Merge branch 'master-chef-11.4' into master-chef-11.10

opsworks_initial_setup/attributes/default.rb

@@ -28,6 +28,9 @@
 default[:opsworks][:ruby_version] = '1.9.3'
 default[:opsworks][:run_cookbook_tests] = false
 
+default['opsworks_initial_setup']['swapfile_name'] = '/var/swapfile'
+default['opsworks_initial_setup']['swapfile_size_mb'] = 256
+
 default[:opsworks_initial_setup][:sysctl] = Mash.new
 default[:opsworks_initial_setup][:sysctl]['net.core.somaxconn'] = 1024           # 128
 default[:opsworks_initial_setup][:sysctl]['net.core.netdev_max_backlog'] = 3072  # 1000

opsworks_initial_setup/recipes/default.rb

@@ -1,3 +1,4 @@
+include_recipe 'opsworks_initial_setup::swap' if node[:ec2] && node[:ec2][:instance_type] == 't1.micro'
 include_recipe 'opsworks_initial_setup::sysctl'
 include_recipe 'opsworks_initial_setup::limits'
 include_recipe 'opsworks_initial_setup::bind_mounts'

opsworks_initial_setup/recipes/swap.rb

@@ -0,0 +1,21 @@
+bash "create swap file #{node['opsworks_initial_setup']['swapfile_name']}" do
+  user 'root'
+  code <<-EOC
+    dd if=/dev/zero of=#{node['opsworks_initial_setup']['swapfile_name']} bs=1M count=#{node['opsworks_initial_setup']['swapfile_size_mb']}
+    mkswap #{node['opsworks_initial_setup']['swapfile_name']}
+    chown root:root #{node['opsworks_initial_setup']['swapfile_name']}
+    chmod 0600 #{node['opsworks_initial_setup']['swapfile_name']}
+  EOC
+  creates node['opsworks_initial_setup']['swapfile_name']
+end
+
+mount 'swap' do
+  action :enable
+  device node['opsworks_initial_setup']['swapfile_name']
+  fstype 'swap'
+end
+
+bash 'activate all swap devices' do
+  user 'root'
+  code 'swapon -a'
+end

passenger_apache2/attributes/passenger.rb

@@ -34,7 +34,7 @@
   default[:passenger][:gems_path] = '/'
 end
 
-default[:passenger][:version] = '4.0.33'
+default[:passenger][:version] = '4.0.39'
 default[:passenger][:root_path] = "#{node[:passenger][:gems_path]}/passenger-#{passenger[:version]}"
 
 if platform?('centos','redhat','fedora','amazon') and node[:packages][:dist_only]