Don't configure resolv.conf if no nameservers are defined

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

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 45c3538fb84e1ab48c27ef0efb1e7c780f6263f8..390576f0cb56e5a8bfb33f2e32bbebe0734f4d4b 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -22,10 +22,12 @@ include_recipe "mediawiki"
 passwords = data_bag_item("foundation", "passwords")
 
 mediawiki_site "board.osmfoundation.org" do
+  sitename "OSMF Board Wiki"
+  metanamespace "OSMFBoard"
   directory "/srv/board.osmfoundation.org"
-  enable_ssl true
+  ssl_enabled true
   database_name "board-wiki"
-  database_username "board-wikiuser"
+  database_user "board-wikiuser"
   database_password passwords["board"]["database"]
   admin_password passwords["board"]["admin"]
   logo "/Wiki.png"
@@ -40,5 +42,5 @@ end
 cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0644
+  mode 0o644
 end