apache: set our correct defaults for mod_evasive

[chef.git] / roles / git.rb

diff --git a/roles/git.rb b/roles/git.rb
index 19ebfcdea7b6ee3de92907f83b21b1c10ac8f1ba..c401c865f6311eece5ec360cb16bccedb864d613 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 => {
 default_attributes(
   :accounts => {
     :users => {

-      :lonvia => {
+      :bretth => {

         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },

-      :translatewiki => {
+      :lonvia => {

         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },


@@ -16,18 +16,23 @@ default_attributes(
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },
         :status => :user,
         :shell => "/usr/bin/git-shell"
       },

+      :stereo => {
+        :status => :user,
+        :shell => "/usr/bin/git-shell"
+      },

       :git => {
         :status => :role,
       :git => {
         :status => :role,

-        :members => [ :tomh, :grant, :matt, :lonvia, :yellowbkpk, :translatewiki ]
+        :members => [:tomh, :grant, :matt, :lonvia, :yellowbkpk, :stereo]

       }
     }
   },
   :git => {
     :host => "git.openstreetmap.org",
       }
     }
   },
   :git => {
     :host => "git.openstreetmap.org",

-    :directory => "/var/lib/git"
+    :aliases => ["git.osm.org"]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "recipe[git::server]"
+  "recipe[git::server]",
+  "recipe[git::web]"

 )
 )