Manage database.yml/memcached.yml when a host is given.

alexislitool · Feb 4, 2014 · 9e25ba1 · 9e25ba1
1 parent 729aa19
commit 9e25ba1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/deploy/definitions/opsworks_deploy.rb b/deploy/definitions/opsworks_deploy.rb
@@ -120,7 +120,7 @@
             )
 
             only_if do
-              node[:opsworks][:layers].has_key?('db-master')
+              deploy[:database][:host].present?
             end
           end.run_action(:create)
         elsif deploy[:application_type] == 'php'

diff --git a/deploy/definitions/opsworks_rails.rb b/deploy/definitions/opsworks_rails.rb
@@ -14,7 +14,7 @@
     variables(:memcached => (deploy[:memcached] || {}), :environment => deploy[:rails_env])
 
     only_if do
-      node[:opsworks][:layers].has_key?('memcached')
+      deploy[:memcached][:host].present?
     end
   end
 

diff --git a/rails/recipes/configure.rb b/rails/recipes/configure.rb
@@ -23,7 +23,7 @@
     notifies :run, "execute[restart Rails app #{application}]"
 
     only_if do
-      node[:opsworks][:layers].has_key?('db-master') && File.exists?("#{deploy[:deploy_to]}") && File.exists?("#{deploy[:deploy_to]}/shared/config/")
+      deploy[:database][:host].present? && File.exists?("#{deploy[:deploy_to]}") && File.exists?("#{deploy[:deploy_to]}/shared/config/")
     end
   end
 
@@ -41,7 +41,7 @@
     notifies :run, "execute[restart Rails app #{application}]"
 
     only_if do
-      node[:opsworks][:layers].has_key?('memcached') && File.exists?("#{deploy[:deploy_to]}") && File.exists?("#{deploy[:deploy_to]}/shared/config/")
+      deploy[:memcached][:host].present? && File.exists?("#{deploy[:deploy_to]}") && File.exists?("#{deploy[:deploy_to]}/shared/config/")
     end
   end
 end