Use consistent ordering in apache configuration

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

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index dae3ca476a219a9e5ce664152d5c4b6f14604f81..e26570a8f2455922820e38f845599ff290a8f385 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -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"]


@@ -34,8 +35,7 @@ mediawiki_site "board.osmfoundation.org" do
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Board Wiki"
   private_site true
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Board Wiki"
   private_site true

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

 end
 
 cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
 end
 
 cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do