From 4ecbfbb252feb2ddc803270ad0f36b0f17cfe78d Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Sat, 29 Jun 2013 08:30:29 +0100
Subject: [PATCH] Rename current wiki role to wiki-old

---
 roles/foundation.rb                |  1 -
 roles/konqi.rb                     |  2 +-
 roles/ouroboros.rb                 |  3 +--
 roles/{wiki-new.rb => wiki-old.rb} | 16 ++++------------
 roles/wiki.rb                      | 14 +++++++++++---
 5 files changed, 17 insertions(+), 19 deletions(-)
 rename roles/{wiki-new.rb => wiki-old.rb} (60%)

diff --git a/roles/foundation.rb b/roles/foundation.rb
index cc80f3dfe..8e763bfce 100644
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -18,6 +18,5 @@ default_attributes(
 )
 
 run_list(
-  "recipe[mediawiki]",
   "recipe[civicrm]"
 )
diff --git a/roles/konqi.rb b/roles/konqi.rb
index 557d762da..017f9de79 100644
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -35,5 +35,5 @@ override_attributes(
 
 run_list(
   "role[ic]",
-  "role[wiki]"
+  "role[wiki-old]"
 )
diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb
index 4160db358..887f1bd12 100644
--- a/roles/ouroboros.rb
+++ b/roles/ouroboros.rb
@@ -27,6 +27,5 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
-  "role[wiki-new]"
+  "role[ic]"
 )
diff --git a/roles/wiki-new.rb b/roles/wiki-old.rb
similarity index 60%
rename from roles/wiki-new.rb
rename to roles/wiki-old.rb
index 6b8f015a1..65ea93701 100644
--- a/roles/wiki-new.rb
+++ b/roles/wiki-old.rb
@@ -1,4 +1,4 @@
-name "wiki-new"
+name "wiki-old"
 description "Role applied to all wiki servers"
 
 default_attributes(
@@ -14,23 +14,15 @@ default_attributes(
     }
   },
   :memcached => {
+    :tcp_port => 11000,
+    :udp_port => 11000,
     :memory_limit => 512,
     :connection_limit => 8192,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
-  },
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_clients => 800,
-      :threads_per_child => 50,
-      :max_requests_per_child => 10000
-    }
   }
 )
 
 run_list(
-  "recipe[mediawiki-new::wiki]"
+  "recipe[mediawiki-old]"
 )
diff --git a/roles/wiki.rb b/roles/wiki.rb
index b1e16207e..fded35d67 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -14,15 +14,23 @@ default_attributes(
     }
   },
   :memcached => {
-    :tcp_port => 11000,
-    :udp_port => 11000,
     :memory_limit => 512,
     :connection_limit => 8192,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
+  },
+  :apache => {
+    :mpm => "prefork",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_clients => 800,
+      :threads_per_child => 50,
+      :max_requests_per_child => 10000
+    }
   }
 )
 
 run_list(
-  "recipe[mediawiki]"
+  "recipe[wiki]"
 )
-- 
2.39.5