quote groups with dash

[chef.git] / roles / angor.rb

diff --git a/roles/angor.rb b/roles/angor.rb
index ff735add6627da371ced92541920cb4f0d5220ff..6ae63081be7a34cdf6fcaa88dae2b4372422f6e2 100644 (file)
--- a/roles/angor.rb
+++ b/roles/angor.rb
@@ -22,23 +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 => "capetown.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[tilecache]"
+  "role[ftp]"
 )