Merge remote-tracking branch 'github/pull/472'

[chef.git] / roles / angor.rb

diff --git a/roles/angor.rb b/roles/angor.rb
index da5d426cee6bc820d5e27631c07cbd00aec9a285..7dcef6843f114f293135c4a671517da6d92f4f3f 100644 (file)
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -21,23 +21,10 @@ default_attributes(
         :gateway => "2001:43f8:1f4:b00::1"
       }
     }
         :gateway => "2001:43f8:1f4:b00::1"
       }
     }

-  },
-  :squid => {
-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "london.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[inxza]"
+  "role[inxza]",
+  "role[ftp]"

 )
 )