git: apache mpm to server role

diff --git a/roles/git.rb b/roles/git.rb
index 889aa2c38e994501f3be33e900d03ef552935fb7..31ad54036829706b2021062d37b0d9b213cf2927 100644 (file)
--- a/roles/git.rb
+++ b/roles/git.rb
@@ -22,14 +22,6 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :apache => {
-    :mpm => "event",
-      :event => {
-        :min_spare_threads => 50,
-        :max_spare_threads => 150,
-        :listen_cores_buckets_ratio => 4
-      }
-  },

   :git => {
     :host => "git.openstreetmap.org",
     :aliases => ["git.osm.org"]
   :git => {
     :host => "git.openstreetmap.org",
     :aliases => ["git.osm.org"]

diff --git a/roles/sarel.rb b/roles/sarel.rb
index e3f550d9cbf59ce044b4e1af41f8fe5b3f004661..ab1bf393b259706a5a450e7336db8d71a1cb9cfb 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -2,6 +2,14 @@ name "sarel"
 description "Master role applied to sarel"
 
 default_attributes(
 description "Master role applied to sarel"
 
 default_attributes(

+  :apache => {
+    :mpm => "event",
+    :event => {
+      :min_spare_threads => 50,
+      :max_spare_threads => 150,
+      :listen_cores_buckets_ratio => 4
+    }
+  },

   :git => {
     :private_user => "chefrepo",
     :private_group => "chefrepo"
   :git => {
     :private_user => "chefrepo",
     :private_group => "chefrepo"