[COOK-606] use private IPs by default

fizo · Jul 12, 2011 · cd3e2ab · cd3e2ab
1 parent ee38fa9
commit cd3e2ab
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/application/recipes/django.rb b/application/recipes/django.rb
@@ -129,7 +129,7 @@
       group app["group"]
       mode "644"
       variables(
-        :host => dbm['fqdn'],
+        :host => (dbm.attribute?('cloud') ? dbm['cloud']['local_ipv4'] : dbm['ipaddress']),
         :database => app['databases'][node.chef_environment],
         :django_version => django_version
       )

diff --git a/application/recipes/java_webapp.rb b/application/recipes/java_webapp.rb
@@ -81,7 +81,7 @@
       dbm = rows[0]
     end
   end
-  
+
   # Assuming we have one...
   if dbm
     template "#{app['deploy_to']}/shared/#{app['id']}.xml" do
@@ -90,7 +90,7 @@
       group app["group"]
       mode "644"
       variables(
-        :host => dbm['fqdn'],
+        :host => (dbm.attribute?('cloud') ? dbm['cloud']['local_ipv4'] : dbm['ipaddress']),
         :app => app['id'],
         :database => app['databases'][node.chef_environment],
         :war => "#{app['deploy_to']}/releases/#{app['war'][node.chef_environment]['checksum']}.war"

diff --git a/application/recipes/mod_php_apache2.rb b/application/recipes/mod_php_apache2.rb
@@ -27,10 +27,10 @@
 include_recipe "apache2::mod_headers"
 include_recipe "apache2::mod_php5"
 
-server_aliases = [ "#{app['id']}.#{node['domain']}", node.fqdn ]
+server_aliases = [ "#{app['id']}.#{node['domain']}", node['fqdn'] ]
 
-if node.has_key?("ec2")
-  server_aliases << node.ec2.public_hostname
+if node.has_key?("cloud")
+  server_aliases << node['cloud']['public_hostname']
 end
 
 web_app app['id'] do

diff --git a/application/recipes/passenger_apache2.rb b/application/recipes/passenger_apache2.rb
@@ -24,10 +24,10 @@
 include_recipe "apache2::mod_rewrite"
 include_recipe "passenger_apache2::mod_rails"
 
-server_aliases = [ "#{app['id']}.#{node[:domain]}", node.fqdn ]
+server_aliases = [ "#{app['id']}.#{node['domain']}", node['fqdn'] ]
 
-if node.has_key?("ec2")
-  server_aliases << node.ec2.public_hostname
+if node.has_key?("cloud")
+  server_aliases << node['cloud']['public_hostname']
 end
 
 web_app app['id'] do

diff --git a/application/recipes/php.rb b/application/recipes/php.rb
@@ -115,7 +115,7 @@
       mode "644"
       variables(
         :path => "#{app['deploy_to']}/current",
-        :host => dbm['fqdn'],
+        :host => (dbm.attribute?('cloud') ? dbm['cloud']['local_ipv4'] : dbm['ipaddress']),
         :database => app['databases'][node.chef_environment],
         :app => app
       )

diff --git a/application/recipes/rails.rb b/application/recipes/rails.rb
@@ -122,7 +122,7 @@
       group app["group"]
       mode "644"
       variables(
-        :host => dbm['fqdn'],
+        :host => (dbm.attribute?('cloud') ? dbm['cloud']['local_ipv4'] : dbm['ipaddress']),
         :databases => app['databases'],
         :rails_env => rails_env
       )