Track backport branches of osm2pgsql git on irc

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 191c6429ff7c4b8bcec17cb621fa82d7e297f71b..2634ec0d2c63f13a8df83007edf5fcd0683be365 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -7,20 +7,39 @@ default_attributes(
       :bretth => {
         :status => :user,
         :shell => "/usr/bin/git-shell"
       :bretth => {
         :status => :user,
         :shell => "/usr/bin/git-shell"

-      },
+      }

     }
   },
   :apache => {
     :mpm => "event",
     :event => {
     }
   },
   :apache => {
     :mpm => "event",
     :event => {

-      :max_requests_per_child => 2000
+      :min_spare_threads => 50,
+      :max_spare_threads => 150

     }
   },
     }
   },

+  :apt => {
+    :sources => ["brightbox-ruby-ng"]
+  },

   :hardware => {
     :modules => [
       "it87"
   :hardware => {
     :modules => [
       "it87"

-    ],
+    ]

   },
   },

+  :openvpn => {
+    :address => "10.0.16.3",
+    :tunnels => {
+      :shenron2ucl => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
+      }
+    }
+  }
+)
+
+override_attributes(

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -38,18 +57,6 @@ default_attributes(
         :address => "2001:41c9:1:400::32",
         :prefix => "64",
         :gateway => "fe80::1"
         :address => "2001:41c9:1:400::32",
         :prefix => "64",
         :gateway => "fe80::1"

-      },
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }

       }
     }
   }
       }
     }
   }


@@ -67,5 +74,6 @@ run_list(
   "role[dns]",
   "role[geodns]",
   "role[chef-repository]",
   "role[dns]",
   "role[geodns]",
   "role[chef-repository]",

+  "recipe[blogs]",

   "recipe[openvpn]"
 )
   "recipe[openvpn]"
 )