X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/db8d46b7feeaefdb105dd0ed9c6d0d0084250b92..bdd6d4fbb325191ae5d0a836460949b7a10908a1:/cookbooks/foundation/recipes/dwg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb index cb2cca105..2eff0db56 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. @@ -25,6 +25,7 @@ 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"] @@ -33,18 +34,14 @@ mediawiki_site "dwg.osmfoundation.org" do email_contact "webmaster@openstreetmap.org" email_sender "webmaster@openstreetmap.org" email_sender_name "OSMF Board Wiki" - private true + private_site true recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" recaptcha_private_key passwords["dwg"]["recaptcha"] -end - -mediawiki_extension "MobileFrontend" do - site "dwg.osmfoundation.org" - template "mw-ext-MobileFrontend.inc.php.erb" + version "1.34" end cookbook_file "/srv/dwg.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end