Enable prometheus monitoring for more PHP-FPM sites

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

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index fb94144165d8efe47c3b403e472996297154b485..84d6b24b18b24fb53e38d0eee8809aa7f9a4e1cc 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -1,8 +1,8 @@
 #
 #

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

 # Recipe:: board
 #
 # Recipe:: board
 #

-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, 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.


@@ -25,6 +25,7 @@ mediawiki_site "board.osmfoundation.org" do
   sitename "OSMF Board Wiki"
   metanamespace "OSMFBoard"
   directory "/srv/board.osmfoundation.org"
   sitename "OSMF Board Wiki"
   metanamespace "OSMFBoard"
   directory "/srv/board.osmfoundation.org"

+  fpm_prometheus_port 11004

   database_name "board-wiki"
   database_user "board-wikiuser"
   database_password passwords["board"]["database"]
   database_name "board-wiki"
   database_user "board-wikiuser"
   database_password passwords["board"]["database"]


@@ -36,15 +37,11 @@ mediawiki_site "board.osmfoundation.org" do
   private_site true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["board"]["recaptcha"]
   private_site true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["board"]["recaptcha"]

-end
-
-mediawiki_extension "MobileFrontend" do
-  site "board.osmfoundation.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
+  version "1.34"

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

-  mode 0o644
+  mode "644"

 end
 end