Add wiki test instance on muirdris

diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index a2c578567cf35272c17cdb8bfb66e7dff7b0ebb6..2f1b50e06942dc887374d2b843a03314f66ca270 100644 (file)
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -2,9 +2,6 @@ name "muirdris"
 description "Master role applied to muirdris"
 
 default_attributes(
 description "Master role applied to muirdris"
 
 default_attributes(

-  :memcached => {
-    :memory_limit => 128 * 1024
-  },

   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {


@@ -32,10 +29,22 @@ default_attributes(
         }
       }
     }
         }
       }
     }

+  },
+  :wiki => {
+    :site_name => "test.wiki.openstreetmap.org",
+    :site_aliases => [],
+    :site_notice => "TEST INSTANCE: Use wiki.openstreetmap.org for real work"
+  }
+)
+
+override_attributes(
+  :memcached => {
+    :memory_limit => 128 * 1024

   }
 )
 
 run_list(
   "role[equinix-dub-public]",
   }
 )
 
 run_list(
   "role[equinix-dub-public]",

-  "role[gps-tile]"
+  "role[gps-tile]",
+  "role[wiki]"

 )
 )