X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a1780627367305e7bd8987ad71fec090cda8743f..59daf18915ef13f46b1e7246e54edf2d78172342:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 5e15212e0..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,14 +17,10 @@ # limitations under the License. # -# include_recipe "squid" - include_recipe "mediawiki" passwords = data_bag_item("wiki", "passwords") -dump_directory = "/srv/wiki.openstreetmap.org/dump" - package "lua5.1" # newer versions do not work with Scribuntu! apache_site "default" do @@ -49,7 +45,7 @@ mediawiki_site "wiki.openstreetmap.org" do email_sender "wiki@noreply.openstreetmap.org" email_sender_name "OpenStreetMap Wiki" - metanamespace "OpenStreetMap" + metanamespace "Wiki" recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz" recaptcha_private_key passwords["recaptcha"] @@ -58,12 +54,11 @@ mediawiki_site "wiki.openstreetmap.org" do # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." end -mediawiki_extension "MobileFrontend" do +mediawiki_extension "CodeEditor" do site "wiki.openstreetmap.org" - template "mw-ext-MobileFrontend.inc.php.erb" end -mediawiki_extension "CodeEditor" do +mediawiki_extension "CodeMirror" do site "wiki.openstreetmap.org" end @@ -75,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 @@ -98,6 +92,17 @@ mediawiki_extension "Thanks" do template_cookbook "wiki" end +mediawiki_extension "TimedMediaHandler" do + site "wiki.openstreetmap.org" +end + +mediawiki_extension "MultiMaps" do + site "wiki.openstreetmap.org" + template "mw-ext-MultiMaps.inc.php.erb" + template_cookbook "wiki" + variables :thunderforest_key => passwords["thunderforest"] +end + cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] @@ -117,16 +122,16 @@ cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do mode 0o644 end -directory dump_directory do +directory "/srv/wiki.openstreetmap.org/dump" do owner node[:mediawiki][:user] group node[:mediawiki][:group] mode "0775" end -template "/etc/cron.d/wiki-osm-org-dump" do +template "/etc/cron.d/wiki-dump" do owner "root" group "root" mode 0o644 - source "cron_wiki_dump.erb" - variables :dumppath => dump_directory + source "wiki-dump.erb" + variables :directory => "/srv/wiki.openstreetmap.org" end