mediawiki: Remove xbl.spamhaus.org DNSBL

[chef.git] / roles / git.rb

diff --git a/roles/git.rb b/roles/git.rb
index 534ad105568ca66833020b23261a502b6c6cf9bd..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,15 +16,19 @@ 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",

-    :backup => "git"
+    :aliases => ["git.osm.org"]

   }
 )
 
   }
 )