Make sure cgimap uses the writable database for updates

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 5d3f5ef932bd19ac4b19ae890068d2a7f686f619..94200c338447af783133944fd81023be7e24c038 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -8,23 +8,23 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet,
         :interface => "eth0",
         :role => :external,
         :family => :inet,

-        :address => "64.62.205.202",
-        :prefix => "26",
-        :gateway => "64.62.205.193"
+        :address => "71.19.155.177",
+        :prefix => "24",
+        :gateway => "71.19.155.1"

       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,

-        :address => "2001:470:1:41:a800:ff:fe3e:cdca",
+        :address => "2605:2700:0:17:a800:ff:fe3e:cdca",

         :prefix => "64",
         :prefix => "64",

-        :gateway => "fe80::260:ddff:fe46:623d"
+        :gateway => "2605:2700:0:17::1"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

-    :cache_mem => "400 MB",
-    :cache_dir => "coss /store/squid/coss-01 7500 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "1024 MB",
+    :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30"

   },
   :sysctl => {
     :kvm => {
   },
   :sysctl => {
     :kvm => {


@@ -33,22 +33,19 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }

-    }
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",

       :parameters => {
       :parameters => {

-        "block/xvda/queue/scheduler" => "deadline"
+        "net.netfilter.nf_conntrack_max" => "65536"

       }
     }
   },
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
       }
     }
   },
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [

-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",

       "stormfly-02.openstreetmap.org",
       "stormfly-02.openstreetmap.org",

+      "ascalon.openstreetmap.org",

       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"