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

[chef.git] / roles / git.rb

diff --git a/roles/git.rb b/roles/git.rb
index 1fb7fac7f0a6510db0a11bd861b38096ab42e2f4..c401c865f6311eece5ec360cb16bccedb864d613 100644 (file)
--- a/roles/git.rb
+++ b/roles/git.rb
@@ -4,26 +4,35 @@ description "Role applied to all git servers"
 default_attributes(
   :accounts => {
     :users => {
+      :bretth => {
+        :status => :user,
+        :shell => "/usr/bin/git-shell"
+      },
       :lonvia => {
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
-      :translatewiki => {
+      :yellowbkpk => {
+        :status => :user,
+        :shell => "/usr/bin/git-shell"
+      },
+      :stereo => {
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
       :git => {
         :status => :role,
-        :members => [ :tomh, :grant, :matt, :lonvia, :translatewiki ]
+        :members => [:tomh, :grant, :matt, :lonvia, :yellowbkpk, :stereo]
       }
     }
   },
   :git => {
     :host => "git.openstreetmap.org",
-    :directory => "/var/lib/git"
+    :aliases => ["git.osm.org"]
   }
 )
 
 run_list(
-  "recipe[git::server]"
+  "recipe[git::server]",
+  "recipe[git::web]"
 )