Skip to content

Modify the cookbook to allow it to be run on any layer, not just 'rails-app' #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modify the cookbook to allow it to be run on any layer, not just 'rails-app' #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f7fdb9
Allow custom environment to be added to any layer, not just rails-app
alexchumak Apr 26, 2016
1f42d4c
By default application's custom environment is an empty Hash
alexchumak Apr 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions recipes/configure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
if node[:opsworks][:instance][:layers].include?('rails-app')

include_recipe "opsworks_custom_env::restart_command"
include_recipe "opsworks_custom_env::write_config"

end
include_recipe "opsworks_custom_env::restart_command"
include_recipe "opsworks_custom_env::write_config"
4 changes: 2 additions & 2 deletions recipes/restart_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node[:deploy].each do |application, deploy|

execute "restart Rails app #{application} for custom env" do
cwd deploy[:current_path]
if node[:opsworks][:rails_stack][:name].eql? "apache_passenger"
Expand All @@ -10,6 +9,7 @@
user deploy[:user]

action :nothing
end

only_if { node[:opsworks][:instance][:layers].include?('rails-app') }
end
end
9 changes: 6 additions & 3 deletions recipes/write_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@
# See https://forums.aws.amazon.com/thread.jspa?threadID=118107

node[:deploy].each do |application, deploy|

# rails apps only
next unless deploy[:application_type].eql?('rails')
# and only if custom_env JSON is present
next unless node[:custom_env].present? && node[:custom_env][application].present?

custom_env_template do
application application
deploy deploy
env node[:custom_env][application]
env node[:custom_env][application] || {}
end

end