Make sure chef mysql configuration overrides defaults

[chef.git] / cookbooks / chef / recipes / server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 2ebf64f72dc6be392acab827923bf87edc9caa6b..8edf4e5593fac583dd180862a3497e7d87c4edab 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 # chef_package = "chef-server-core_#{node[:chef][:server][:version]}_amd64.deb"
 #
@@ -80,7 +80,6 @@ apache_module "proxy_http"
 
 ssl_certificate "chef.openstreetmap.org" do
   domains ["chef.openstreetmap.org", "chef.osm.org"]
-  fallback_certificate "openstreetmap"
   notifies :reload, "service[apache2]"
 end