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

[chef.git] / roles / git.rb

diff --git a/roles/git.rb b/roles/git.rb
index 0b41762234c1566835c8ba1ec3575a7b989cc508..31ad54036829706b2021062d37b0d9b213cf2927 100644 (file)
--- a/roles/git.rb
+++ b/roles/git.rb
@@ -4,11 +4,11 @@ description "Role applied to all git servers"
 default_attributes(
   :accounts => {
     :users => {
-      :lonvia => {
+      :bretth => {
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
-      :translatewiki => {
+      :lonvia => {
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
@@ -18,12 +18,13 @@ default_attributes(
       },
       :git => {
         :status => :role,
-        :members => [ :tomh, :grant, :matt, :lonvia, :yellowbkpk, :translatewiki ]
+        :members => [:tomh, :grant, :matt, :lonvia, :yellowbkpk]
       }
     }
   },
   :git => {
-    :host => "git.openstreetmap.org"
+    :host => "git.openstreetmap.org",
+    :aliases => ["git.osm.org"]
   }
 )