Enable za-imagery user and role

[chef.git] / roles / angor.rb

diff --git a/roles/angor.rb b/roles/angor.rb
index da5d426cee6bc820d5e27631c07cbd00aec9a285..6cd1fd19765e0255ee95ebbeb4ecee7aef2c0058 100644 (file)
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -22,22 +22,20 @@ default_attributes(
       }
     }
   },
-  :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"
-    ]
+  :accounts => {
+    :users => {
+      :htonl => { :status => :user },
+      :gmoncrieff => { :status => :user },
+      :zander => { :status => :user },
+      :za-imagery => {
+          :status => :role,
+          :members => [:grant, :htonl, :gmoncrieff, :zander]
+      }
+    }
   }
 )
 
 run_list(
-  "role[inxza]"
+  "role[inxza]",
+  "role[ftp]"
 )