From: Grant Slater <git@firefishy.com>
Date: Sat, 16 Mar 2019 23:49:17 +0000 (+0000)
Subject: mediawiki: add MobileFrontend ext by default
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/420ed946bedec1d5b3f1e18df9b8f7a912a4abed

mediawiki: add MobileFrontend ext by default
---

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index fb9414416..3388848b8 100644
--- 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 5df9442ee..9ae78d5c3 100644
--- 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 df98b3542..963e24fe5 100644
--- 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 e13aaa186..8824b88a1 100644
--- 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 57f30549b..8096299a6 100644
--- 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 3e3815dca..f1317ad54 100644
--- 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