mediawiki: add MobileFrontend ext by default

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index fb94144165d8efe47c3b403e472996297154b485..3388848b8238910f6f206336b5a47d548a887985 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -38,11 +38,6 @@ mediawiki_site "board.osmfoundation.org" do
   recaptcha_private_key passwords["board"]["recaptcha"]
 end
 
-mediawiki_extension "MobileFrontend" do
-  site "board.osmfoundation.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
-end
-
 cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb
index 5df9442eee9fd4a9f75ff91e362fa20af214edaf..9ae78d5c34b4e5aac8e82dd418b7e1554d2fbb7e 100644 (file)
--- a/cookbooks/foundation/recipes/dwg.rb
+++ b/cookbooks/foundation/recipes/dwg.rb
@@ -38,11 +38,6 @@ mediawiki_site "dwg.osmfoundation.org" do
   recaptcha_private_key passwords["dwg"]["recaptcha"]
 end
 
-mediawiki_extension "MobileFrontend" do
-  site "dwg.osmfoundation.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
-end
-
 cookbook_file "/srv/dwg.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb
index df98b35421ec62bfa59ccbd13875395d5539992e..963e24fe54f78a384cf6a87374e1b8fd7136c1d2 100644 (file)
--- a/cookbooks/foundation/recipes/mwg.rb
+++ b/cookbooks/foundation/recipes/mwg.rb
@@ -38,11 +38,6 @@ mediawiki_site "mwg.osmfoundation.org" do
   recaptcha_private_key passwords["mwg"]["recaptcha"]
 end
 
-mediawiki_extension "MobileFrontend" do
-  site "mwg.osmfoundation.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
-end
-
 cookbook_file "/srv/mwg.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index e13aaa186d6adc88d210baa2ff17168681b34f65..8824b88a1c4a1216ff0089336f591270402b1bf8 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -41,11 +41,6 @@ mediawiki_site "wiki.osmfoundation.org" do
   extra_file_extensions ["mp3"]
 end
 
-mediawiki_extension "MobileFrontend" do
-  action :delete
-  site "wiki.osmfoundation.org"
-end
-
 mediawiki_skin "osmf" do
   site "wiki.osmfoundation.org"
   repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 57f30549b7870872a048e27e866f6cd9829efa65..8096299a673e86ed125f7c1c1ddf314ef871c9f7 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -187,12 +187,19 @@ action :create do
               :database_params => database_params
   end
 
-  mediawiki_skin "MinervaNeue" do # ~FC005
+  # MobileFrontend extension is required by MinervaNeue skin
+  mediawiki_extension "MobileFrontend" do # ~FC005
+    site new_resource.site
+    template "mw-ext-MobileFrontend.inc.php.erb"
+  end
+
+  # MobileFrontend extension is required by MinervaNeue skin
+  mediawiki_skin "MinervaNeue" do
     site new_resource.site
     update_site false
   end
 
-  mediawiki_skin "CologneBlue" do # ~FC005
+  mediawiki_skin "CologneBlue" do
     site new_resource.site
     update_site false
   end

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 3e3815dcabf9e238322f319587f42c86d772268c..f1317ad54e57fe6943006fb3873e774bc03fb8f3 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -56,11 +56,6 @@ mediawiki_site "wiki.openstreetmap.org" do
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
-mediawiki_extension "MobileFrontend" do
-  site "wiki.openstreetmap.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
-end
-
 mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
 end