use chef environment in nginx config

rubygems · Aug 8, 2014 · 8b83dc7 · 8b83dc7
1 parent 922a291
commit 8b83dc7
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -216,7 +216,7 @@ GRAPH
   rubygems-backups (0.0.17)
     chef-vault (>= 0.0.0)
     rubygems-ruby (>= 0.0.0)
-  rubygems-balancer (0.0.26)
+  rubygems-balancer (0.0.27)
     chef-vault (>= 0.0.0)
     nginx (>= 0.0.0)
     rubygems (>= 0.0.0)

diff --git a/cookbooks/rubygems-balancer/metadata.rb b/cookbooks/rubygems-balancer/metadata.rb
@@ -1,6 +1,6 @@
 name 'rubygems-balancer'
 
-version '0.0.26'
+version '0.0.27'
 
 depends 'chef-vault'
 depends 'nginx'

diff --git a/cookbooks/rubygems-balancer/templates/default/site.conf.erb b/cookbooks/rubygems-balancer/templates/default/site.conf.erb
@@ -67,69 +67,69 @@ server {
     }
 
     location = /specs.4.8.gz {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /latest_specs.4.8.gz {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /prerelease_specs.4.8.gz {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     # Crufty old redirects
 
     location = /specs.4.8 {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /latest_specs.4.8 {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /prerelease_specs.4.8 {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /quick/rubygems-update-1.3.6.gemspec.rz {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /yaml.Z {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /yaml.z {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /yaml {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /Marshal.4.8.Z {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /Marshal.4.8 {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /quick/index.rz {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /quick/index {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /quick/latest_index.rz {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location = /quick/latest_index {
-      rewrite ^ http://production.s3.rubygems.org$request_uri redirect;
+      rewrite ^ http://<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
     }
 
     location /stylesheets/ {
@@ -237,69 +237,69 @@ server {
   }
 
   location = /specs.4.8.gz {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /latest_specs.4.8.gz {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /prerelease_specs.4.8.gz {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   # Crufty old redirects
 
   location = /specs.4.8 {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /latest_specs.4.8 {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /prerelease_specs.4.8 {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /quick/rubygems-update-1.3.6.gemspec.rz {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /yaml.Z {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /yaml.z {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /yaml {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /Marshal.4.8.Z {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /Marshal.4.8 {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /quick/index.rz {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /quick/index {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /quick/latest_index.rz {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   location = /quick/latest_index {
-    rewrite ^ https://s3.amazonaws.com/production.s3.rubygems.org$request_uri redirect;
+    rewrite ^ https://s3.amazonaws.com/<%= node.chef_environment %>.s3.rubygems.org$request_uri redirect;
   }
 
   ##### END legacy rules