Set sensible time servers for Spanish cache

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 4eb5fbc45c39752557ff368f926bfce68e4a4747..38bc9edb822d69ae8ded00f52585464844050c83 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -22,12 +22,6 @@ default_attributes(
       :data => "/store/elasticsearch"
     }
   },
-  :git => {
-    :allowed_nodes => "*:*",
-    :user => "chefrepo",
-    :group => "chefrepo",
-    :backup => "chef-git"
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -107,8 +101,7 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external (wates)
-          "128.40.45.192/27",     # ucl external (wolfson)
+          "193.60.236.0/24",      # ucl external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
@@ -127,8 +120,6 @@ default_attributes(
 run_list(
   "role[ic]",
   "role[gateway]",
-  "role[chef-server]",
-  "role[chef-repository]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
@@ -138,7 +129,5 @@ run_list(
   "role[logstash]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
-  "recipe[git::server]",
-  "recipe[tilelog]",
-  "recipe[serverinfo]"
+  "recipe[tilelog]"
 )