Rename current wiki role to wiki-old

diff --git a/roles/foundation.rb b/roles/foundation.rb
index cc80f3dfe9b2d0d339c40378dae8792d7c9153d8..8e763bfcef71819dfe187c838652febd6d76bfaa 100644 (file)
--- 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 557d762da186bf723e7ad26abbdb1b16b73db81c..017f9de7977762129c619fcc91c510b72c446bad 100644 (file)
--- 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 4160db3586cdefd0695c020ce03c70fc04459865..887f1bd126b8c1f4dbd88982efbfae00d317b7d3 100644 (file)
--- 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 6b8f015a1dbba6aa2a46d43499c78167e1c0707a..65ea937015b0ac32bcb8473e874c0de0807b41ce 100644 (file)
--- 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 b1e16207e00084d5f9b33f451bd15be13bd4488b..fded35d67cfe24d8a8851cf78fe0f07121ea800f 100644 (file)
--- 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]"
 )