X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0fc8ff6c088451fcd70296d64929e8de791e182a..01e2c8dc07b63532dcae2e7259619c809cbf1619:/cookbooks/foundation/recipes/dwg.rb diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb index 539790a0f..b8fb93f61 100644 --- a/cookbooks/foundation/recipes/dwg.rb +++ b/cookbooks/foundation/recipes/dwg.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: foundation +# Cookbook:: foundation # Recipe:: dwg # -# Copyright 2016, OpenStreetMap Foundation +# Copyright:: 2016, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,28 +24,22 @@ passwords = data_bag_item("foundation", "passwords") mediawiki_site "dwg.osmfoundation.org" do sitename "OSMF Data Working Group Wiki" metanamespace "OSMFDWG" - directory "/srv/dwg.osmfoundation.org" + fpm_prometheus_port 11002 database_name "dwg-wiki" database_user "dwg-wikiuser" database_password passwords["dwg"]["database"] admin_password passwords["dwg"]["admin"] logo "/Wiki.png" email_contact "webmaster@openstreetmap.org" - email_sender "webmaster@openstreetmap.org" + email_sender "wiki@noreply.openstreetmap.org" email_sender_name "OSMF Board Wiki" - private true - recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" - recaptcha_private_key passwords["dwg"]["recaptcha"] - version "1.31" -end - -mediawiki_extension "MobileFrontend" do - site "dwg.osmfoundation.org" - template "mw-ext-MobileFrontend.inc.php.erb" + private_site true + extra_file_extensions %w[pptx] + version "1.39" end cookbook_file "/srv/dwg.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end