Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index c657bb7062c8d8e4e58d4c6beff5b5e52166195e..47625ae0d5935241c4baa9d7c60409bd57029f83 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: wiki.openstreetmap.org
+# Cookbook:: wiki.openstreetmap.org

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

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

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


@@ -72,7 +72,6 @@ end
 
 mediawiki_extension "Wikibase" do
   site "wiki.openstreetmap.org"
 
 mediawiki_extension "Wikibase" do
   site "wiki.openstreetmap.org"

-  compose true

   template "mw-ext-Wikibase.inc.php.erb"
   template_cookbook "wiki"
 end
   template "mw-ext-Wikibase.inc.php.erb"
   template_cookbook "wiki"
 end