Use chef 14 to run tests

[chef.git] / cookbooks / planet / recipes / default.rb

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index c1951d5e7de3d8d0213cfd38556b51c5d3a362fa..5dd5953f85aaef5164b3349edcb882f046651a39 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: planet
+# Cookbook:: planet

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -91,11 +91,13 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   owner "root"
   group "root"
   mode 0o755
   owner "root"
   group "root"
   mode 0o755

+  notifies :restart, "service[apache2]"

 end
 
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"
 end
 
 apache_module "cgid"
 apache_module "rewrite"
 apache_module "proxy_http"

+apache_module "ratelimit"

 
 ssl_certificate "planet.openstreetmap.org" do
   domains ["planet.openstreetmap.org", "planet.osm.org"]
 
 ssl_certificate "planet.openstreetmap.org" do
   domains ["planet.openstreetmap.org", "planet.osm.org"]