Fix composite munin graphs for amsterdam

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

diff --git a/cookbooks/subversion/recipes/default.rb b/cookbooks/subversion/recipes/default.rb
index 8419bbc40dfd3d6348e51e76870961ec54c894a0..8ec5431ab5b62843c15ad1ac9afd7b9a58736de2 100644 (file)
--- a/cookbooks/subversion/recipes/default.rb
+++ b/cookbooks/subversion/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,


@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 package "subversion"
 
 
 package "subversion"
 


@@ -53,7 +53,6 @@ end
 
 ssl_certificate site_name do
   domains site_name
 
 ssl_certificate site_name do
   domains site_name

-  fallback_certificate "openstreetmap"

   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end