Revert "Block tile (purging) scraper: taxi123.pl"

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index c831c995cc0826fe72c83aa64ea23d69654106ce..4bcb8fb268bf6b9c4ea79b6e5849402932d22c2c 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -3,10 +3,12 @@ description "Master role applied to ironbelly"
 
 default_attributes(
   :apt => {
 
 default_attributes(
   :apt => {

-    :sources => [ "ubuntugis-unstable" ]
+    :sources => ["ubuntugis-unstable"]

   },
   :git => {
     :allowed_nodes => "*:*",
   },
   :git => {
     :allowed_nodes => "*:*",

+    :user => "chefrepo",
+    :group => "chefrepo",

     :backup => "chef-git"
   },
   :networking => {
     :backup => "chef-git"
   },
   :networking => {


@@ -54,9 +56,9 @@ default_attributes(
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,

-        :hosts_allow => [ 
-          "89.16.179.150",                       # shenron
-          "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron
+        :hosts_allow => [
+          "212.110.172.32",                      # shenron
+          "2001:41c9:1:400::32",                 # shenron

           "212.159.112.221"                      # grant
         ]
       },
           "212.159.112.221"                      # grant
         ]
       },


@@ -70,7 +72,8 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [

-          "128.40.168.0/24",      # ucl external
+          "128.40.168.0/24",      # ucl external (wates)
+          "128.40.45.192/27",     # ucl external (wolfson)

           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external


@@ -81,7 +84,7 @@ default_attributes(
       }
     }
   }
       }
     }
   }

-);
+)

 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",


@@ -93,7 +96,9 @@ run_list(
   "role[backup]",
   "role[stats]",
   "role[planet]",
   "role[backup]",
   "role[stats]",
   "role[planet]",

+  "role[planetdump]",

   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[rsyncd]",
   "recipe[openvpn]",

-  "recipe[git::server]"
+  "recipe[git::server]",
+  "recipe[tilelog]"

 )
 )