Remove attempt to force geodns rebuilds with --assume-new

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index c657bb7062c8d8e4e58d4c6beff5b5e52166195e..7e9569098f2e573430185ab3047f35407bec7335 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.


@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-# include_recipe "squid"
-

 include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
 include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")


@@ -72,14 +70,13 @@ 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
 
 mediawiki_extension "OsmWikibase" do
   site "wiki.openstreetmap.org"
   template "mw-ext-Wikibase.inc.php.erb"
   template_cookbook "wiki"
 end
 
 mediawiki_extension "OsmWikibase" do
   site "wiki.openstreetmap.org"

-  repository "git://github.com/nyurik/OsmWikibase.git"
+  repository "https://github.com/nyurik/OsmWikibase.git"

   reference "master"
 end
 
   reference "master"
 end