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

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 82012eda9eca1320555dabd6f9177305f5b35137..cf41dcb486fef66c980e529646705d02b195ec33 100644 (file)
--- 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
 
   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]
 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 b19e7cfececf9a9316ce371cd58f95b719b283d8..cb2cca10524e774787df70fb8a728d6acc61397d 100644 (file)
--- 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
 
   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]
 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 0c0bf6a76663979e965decc97c23a28f169032ba..28f5e7fba6bb33fc2abe3cd50a452a76349323b8 100644 (file)
--- 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
 
   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"
 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 0781de597c0ac43a49ce037168616c9fabe2453c..351ab9dcabed381d3e372d82b6669fdbe3fe81e4 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -430,12 +430,6 @@ action :create do
     action :delete
   end
 
     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"
   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 d4aa62b20ace5f51ccdc3644c05cc5295fb55396..55eebc2a4983426baadb54825665f0eb5fdf36ef 100644 (file)
--- 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
 
   # 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]
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]