add nginx blacklist file

rubygems · Sep 13, 2014 · a534849 · a534849
1 parent b5c1301
commit a534849
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/cookbooks/rubygems-balancer/metadata.rb b/cookbooks/rubygems-balancer/metadata.rb
@@ -1,6 +1,6 @@
 name 'rubygems-balancer'
 
-version '0.0.29'
+version '0.0.32'
 
 depends 'chef-vault'
 depends 'nginx'

diff --git a/cookbooks/rubygems-balancer/recipes/site.rb b/cookbooks/rubygems-balancer/recipes/site.rb
@@ -11,6 +11,13 @@
   notifies :restart, 'service[nginx]', :immediately
 end
 
+file "#{node['nginx']['dir']}/blacklist.conf" do
+  action :create_if_missing
+  owner 'root'
+  group 'root'
+  mode '0644'
+end
+
 template "#{node['nginx']['dir']}/sites-available/rubygems" do
   source 'site.conf.erb'
   owner  'root'

diff --git a/cookbooks/rubygems-balancer/templates/default/site.conf.erb b/cookbooks/rubygems-balancer/templates/default/site.conf.erb
@@ -50,7 +50,8 @@ server {
       deny all;
     }
 
-    include <%= node['nginx']['dir'] %>/filters.conf;
+    include <%= node['nginx']['dir'] %>/filters.conf; # managed by chef
+    include <%= node['nginx']['dir'] %>/blacklist.conf; # not managed by chef
 
     location ~ /gems/(.*)\.gem$ {
         set $gem $1;
@@ -213,7 +214,8 @@ server {
 
   client_max_body_size 500M;
 
-  include <%= node['nginx']['dir'] %>/filters.conf;
+  include <%= node['nginx']['dir'] %>/filters.conf; # managed by chef
+  include <%= node['nginx']['dir'] %>/blacklist.conf; # not managed by chef
 
   ##### BEGIN legacy rules
 

diff --git a/environments/common.json b/environments/common.json
@@ -7,7 +7,7 @@
         "rubygems-app": "= 0.0.31",
         "rubygems-apt": "= 0.0.15",
         "rubygems-backups": "= 0.0.18",
-        "rubygems-balancer": "= 0.0.29",
+        "rubygems-balancer": "= 0.0.32",
         "rubygems-bastion": "= 0.0.10",
         "rubygems-cache": "= 0.0.3",
         "rubygems-chef": "= 0.0.29",

diff --git a/environments/production.json b/environments/production.json
@@ -7,7 +7,7 @@
         "rubygems-app": "= 0.0.31",
         "rubygems-apt": "= 0.0.15",
         "rubygems-backups": "= 0.0.18",
-        "rubygems-balancer": "= 0.0.29",
+        "rubygems-balancer": "= 0.0.32",
         "rubygems-bastion": "= 0.0.10",
         "rubygems-cache": "= 0.0.3",
         "rubygems-chef": "= 0.0.29",

diff --git a/environments/staging.json b/environments/staging.json
@@ -7,7 +7,7 @@
         "rubygems-app": "= 0.0.31",
         "rubygems-apt": "= 0.0.15",
         "rubygems-backups": "= 0.0.18",
-        "rubygems-balancer": "= 0.0.29",
+        "rubygems-balancer": "= 0.0.32",
         "rubygems-bastion": "= 0.0.10",
         "rubygems-cache": "= 0.0.3",
         "rubygems-chef": "= 0.0.29",