Make sure tile cookbook only requests the required postgres version

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index c7c0441e026dee37583ac6ea8c6759ab0128675c..246f83cd1d6c5319b133fd3e718b0c5e129bd916 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -4,15 +4,17 @@ description "Role applied to all imagery servers"
 default_attributes(
   :accounts => {
     :users => {
+      :dmlu => { :status => :user },
       :htonl => { :status => :user },
+      :stereo => { :status => :user },
       :imagery => {
         :status => :role,
-        :members => [:grant, :tomh, :htonl]
+        :members => [:grant, :tomh, :dmlu, :htonl, :stereo ]
       }
     }
   },
   :apt => {
-    :sources => ["nginx"]
+    :sources => %w[ubuntugis-unstable]
   },
   :sysctl => {
     :sockets => {
@@ -53,6 +55,8 @@ run_list(
   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
   "recipe[imagery::gb_surrey_aerial]",
-  "recipe[imagery::za_ngi_topo],"
-  "recipe[imagery::za_coct_aerial]"
+  "recipe[imagery::za_ngi_topo]",
+  "recipe[imagery::za_coct_aerial]",
+  "recipe[imagery::na_sgswa_topo]",
+  "recipe[imagery::lu_ngl_dtm]"
 )