Bring web site back online using karm

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 165b4adfc9718ad970832a44af033aecb39aee5e..39117f4dc926a8b4319c4e8afe4d6ae455e73b87 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -192,7 +192,7 @@
   ProxyPass /api/0.6/amf/read balancer://backend/api/0.6/amf/read
   ProxyPass /api/0.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+)$ balancer://backend$1
   ProxyPass /api/0.6/amf/read balancer://backend/api/0.6/amf/read
   ProxyPass /api/0.6/swf/trackpoints balancer://backend/api/0.6/swf/trackpoints
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+)$ balancer://backend$1

-  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://bytemark$1
+  ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/upload)$ balancer://ic$1

   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/changeset/[0-9]+/download)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+)$ balancer://backend$1
   ProxyPassMatch ^(/api/0\.6/(node|way|relation)/[0-9]+/(full|history|search|ways))$ balancer://backend$1


@@ -233,11 +233,11 @@
   </Proxy>
 
   #
   </Proxy>
 
   #

-  # Define a load balancer for the Bytemark backends
+  # Define a load balancer for the IC backends

   #
   #

-  <Proxy balancer://bytemark>
+  <Proxy balancer://ic>

     ProxySet lbmethod=bybusyness
     ProxySet lbmethod=bybusyness

-<% ["rails4.bm", "rails5.bm"].each do |backend| -%>
+<% ["rails1.bm", "rails2.bm", "rails3.bm"].each do |backend| -%>

 <% if port == 443 -%>
     BalancerMember https://<%= backend %> disablereuse=on
 <% else -%>
 <% if port == 443 -%>
     BalancerMember https://<%= backend %> disablereuse=on
 <% else -%>

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 6d539ff5f65207391a46cbcd56e69a00bfb4b177..ff4e45acef242084f6a2f81c9aeeeba41e8b14df 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -28,8 +28,7 @@ default_attributes(
   },
   :web => {
     :backends => %w(rails4 rails5),
   },
   :web => {
     :backends => %w(rails4 rails5),

-    :fileserver => "grisu",
-    :readonly_database_host => "katla.bm.openstreetmap.org"
+    :fileserver => "grisu"

   }
 )
 
   }
 )
 

diff --git a/roles/web-db.rb b/roles/web-db.rb
index 7ae1af973d0055005f56a5bcd1770550ad429d3d..c70aaad73995d3660f82bc56f3b6f688a2be1d3e 100644 (file)
--- a/roles/web-db.rb
+++ b/roles/web-db.rb
@@ -3,6 +3,6 @@ description "Role applied to all servers needing to find the main database"
 
 default_attributes(
   :web => {
 
 default_attributes(
   :web => {

-    :database_host => "katla.bm.openstreetmap.org"
+    :database_host => "karm.ic.openstreetmap.org"

   }
 )
   }
 )

diff --git a/roles/web.rb b/roles/web.rb
index c09998637230af1d6e333c33b578e7fe15a40dc3..dce003b3da9acf40909b1fce6c902aad16a1f05d 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -14,7 +14,7 @@ default_attributes(
     :pool_idle_time => 0
   },
   :web => {
     :pool_idle_time => 0
   },
   :web => {

-    :status => "database_offline",
+    :status => "online",

     :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
   }
 )
     :memcached_servers => %w(rails1.ic rails2.ic rails3.ic)
   }
 )