X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a4854a36f1643daa8ab352ccdf96b12dab5fb346..571e5982cc82c4fbefff0d463895a029a68921fe:/cookbooks/foundation/recipes/dwg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb index 6df491ca3..b8fb93f61 100644 --- a/cookbooks/foundation/recipes/dwg.rb +++ b/cookbooks/foundation/recipes/dwg.rb @@ -1,14 +1,14 @@ # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -24,24 +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" - ssl_enabled true + 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.28" + 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