X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9a3724f3ae8f4ef50a5b97fdb0e7ccffc8a2fc6f..22bfa5e6f8152e492f21ae2c972a164474cfdd61:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index c657bb706..7e9569098 100644 --- 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 # -# 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. @@ -17,8 +17,6 @@ # limitations under the License. # -# include_recipe "squid" - include_recipe "mediawiki" passwords = data_bag_item("wiki", "passwords") @@ -72,14 +70,13 @@ end 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" - repository "git://github.com/nyurik/OsmWikibase.git" + repository "https://github.com/nyurik/OsmWikibase.git" reference "master" end