X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/eedfc932b08ad0d643efc74e1da7734acb92cf41..bcc7d3796af2aa1bb18b17c1321f20ed5b17b964:/cookbooks/foundation/recipes/mwg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb index 001019245..df6f860ce 100644 --- a/cookbooks/foundation/recipes/mwg.rb +++ b/cookbooks/foundation/recipes/mwg.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: foundation +# Cookbook:: foundation # Recipe:: mwg # -# Copyright 2019, OpenStreetMap Foundation +# Copyright:: 2019, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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" @@ -36,15 +36,11 @@ mediawiki_site "mwg.osmfoundation.org" do private_site true recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" recaptcha_private_key passwords["mwg"]["recaptcha"] -end - -mediawiki_extension "MobileFrontend" do - site "mwg.osmfoundation.org" - template "mw-ext-MobileFrontend.inc.php.erb" + version "1.34" end cookbook_file "/srv/mwg.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end