Block faked Chrome 34 user agent from planet

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 8032eee20875adc8386c309fef302871379c732c..5042c4dd0547547d9d01e28a8abbab4fc2afc662 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,9 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },

+  :bind => {
+    :clients => "equinix"
+  },

   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"
   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"


@@ -52,33 +55,6 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      },
-      :aws2ic => {
-        :port => "1195",
-        :mode => "server",
-        :peer => {
-          :host => "fafnir.openstreetmap.org"
-        }
-      },
-      :ic2bm => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "grisu.openstreetmap.org",
-          :port => "1194"
-        }
-      }
-    }
-  },

   :planet => {
     :replication => "enabled"
   },
   :planet => {
     :replication => "enabled"
   },


@@ -131,12 +107,9 @@ run_list(
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",

-  "role[stats]",

   "role[planet]",
   "role[planetdump]",
   "role[planet]",
   "role[planetdump]",

-  "role[logstash]",

   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",

-  "recipe[openvpn]",

   "recipe[tilelog]"
 )
   "recipe[tilelog]"
 )