Modify backup expiry script to expire everything when no prefix is given

[chef.git] / cookbooks / foundation / recipes / mwg.rb

diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb
index 001019245d3e4b5bf03d63c5109c44289ad15b53..963e24fe54f78a384cf6a87374e1b8fd7136c1d2 100644 (file)
--- a/cookbooks/foundation/recipes/mwg.rb
+++ b/cookbooks/foundation/recipes/mwg.rb
@@ -25,8 +25,8 @@ mediawiki_site "mwg.osmfoundation.org" do
   sitename "OSMF Membership Working Group Wiki"
   metanamespace "OSMFMWG"
   directory "/srv/mwg.osmfoundation.org"
-  database_name "mwg-wiki"
-  database_user "mwg-wikiuser"
+  database_name "mwg_wiki"
+  database_user "mwg_wikiuser"
   database_password passwords["mwg"]["database"]
   admin_password passwords["mwg"]["admin"]
   logo "/Wiki.png"
@@ -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]