Add the Wolfson House addresses to various allow lists

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 40455ab24f9951ddc5823271d4b46709fd2e01bc..513dcef031da09d05a906ca598053a0ea633ae69 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,6 +2,15 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
+  :apt => {
+    :sources => [ "ubuntugis-unstable" ]
+  },
+  :git => {
+    :allowed_nodes => "*:*",
+    :user => "chefrepo",
+    :group => "chefrepo",
+    :backup => "chef-git"
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -63,13 +72,15 @@ default_attributes(
         :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
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
-        ]
+        ],
+        :nodes_allow => "roles:tilecache"
       }
     }
   }
@@ -80,6 +91,13 @@ run_list(
   "role[gateway]",
   "role[chef-server]",
   "role[chef-repository]",
+  "role[web-storage]",
+  "role[supybot]",
+  "role[backup]",
+  "role[stats]",
+  "role[planet]",
+  "role[planetdump]",
   "recipe[rsyncd]",
-  "recipe[openvpn]"
+  "recipe[openvpn]",
+  "recipe[git::server]"
 )