Add monitoring for AWS billing metrics

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

diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb
index 091121236f6243929154787aefc27260d048a6bc..e9263ba0a1cc62c26a177ebf8b9d611081fc612a 100644 (file)
--- a/cookbooks/foundation/recipes/mwg.rb
+++ b/cookbooks/foundation/recipes/mwg.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: foundation
+# Cookbook:: foundation

 # Recipe:: mwg
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -24,23 +24,21 @@ passwords = data_bag_item("foundation", "passwords")
 mediawiki_site "mwg.osmfoundation.org" do
   sitename "OSMF Membership Working Group Wiki"
   metanamespace "OSMFMWG"
 mediawiki_site "mwg.osmfoundation.org" do
   sitename "OSMF Membership Working Group Wiki"
   metanamespace "OSMFMWG"

-  directory "/srv/mwg.osmfoundation.org"
+  fpm_prometheus_port 11003

   database_name "mwg_wiki"
   database_user "mwg_wikiuser"
   database_password passwords["mwg"]["database"]
   admin_password passwords["mwg"]["admin"]
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   database_name "mwg_wiki"
   database_user "mwg_wikiuser"
   database_password passwords["mwg"]["database"]
   admin_password passwords["mwg"]["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_site true
   email_sender_name "OSMF Board Wiki"
   private_site true

-  recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
-  recaptcha_private_key passwords["mwg"]["recaptcha"]
-  version "1.33"
+  version "1.39"

 end
 
 cookbook_file "/srv/mwg.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
 end
 
 cookbook_file "/srv/mwg.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

-  mode 0o644
+  mode "644"

 end
 end