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

[chef.git] / roles / osqa.rb

diff --git a/roles/osqa.rb b/roles/osqa.rb
index 1abaf1fb521d2ad8ce37d47fa826ae0be5d4b545..45a4cf04c1bca0aa8f0eb7e99908252faf8012c9 100644 (file)
--- a/roles/osqa.rb
+++ b/roles/osqa.rb
@@ -2,14 +2,11 @@ name "osqa"
 description "Role applied to all OSQA servers"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :osqa => { :status => :role }
-    }
-  },
   :osqa => {
     :sites => [
-      { :name => "help.openstreetmap.org", :backup => "osqa" }
+      { :name => "help.openstreetmap.org",
+        :aliases => ["help.osm.org"],
+        :backup => "osqa" }
     ]
   }
 )