From db8d46b7feeaefdb105dd0ed9c6d0d0084250b92 Mon Sep 17 00:00:00 2001
From: Michael Glanznig <nebulon42@mailbox.org>
Date: Mon, 30 Apr 2018 09:55:20 +0200
Subject: [PATCH] Remove MobileFrontend mediawiki extension from OSMF wiki

Remove MobileFrontend mediawiki extension from common extensions
and re-add to all wikis except OSMF wiki.

Fixes #159
Closes #160
---
 cookbooks/foundation/recipes/board.rb | 5 +++++
 cookbooks/foundation/recipes/dwg.rb   | 5 +++++
 cookbooks/foundation/recipes/wiki.rb  | 5 +++++
 cookbooks/mediawiki/resources/site.rb | 6 ------
 cookbooks/wiki/recipes/default.rb     | 5 +++++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 82012eda9..cf41dcb48 100644
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -38,6 +38,11 @@ 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 b19e7cfec..cb2cca105 100644
--- a/cookbooks/foundation/recipes/dwg.rb
+++ b/cookbooks/foundation/recipes/dwg.rb
@@ -38,6 +38,11 @@ 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/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 0c0bf6a76..28f5e7fba 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -41,6 +41,11 @@ mediawiki_site "wiki.osmfoundation.org" do
   extra_file_extensions ["mp3"]
 end
 
+mediawiki_extension "MobileFrontend" do
+  action :delete
+  site "board.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 0781de597..351ab9dca 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -430,12 +430,6 @@ action :create do
     action :delete
   end
 
-  mediawiki_extension "MobileFrontend" do
-    site new_resource.site
-    template "mw-ext-MobileFrontend.inc.php.erb"
-    update_site false
-  end
-
   mediawiki_extension "DisableAccount" do
     site new_resource.site
     template "mw-ext-DisableAccount.inc.php.erb"
diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index d4aa62b20..55eebc2a4 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -54,6 +54,11 @@ 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
+
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-- 
2.43.2