X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/db8d46b7feeaefdb105dd0ed9c6d0d0084250b92..a25938bd48ae5f101a04cb46eae4dfe2ee1ac632:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 55eebc2a4..455d8ede1 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -23,6 +23,8 @@ include_recipe "mediawiki" passwords = data_bag_item("wiki", "passwords") +package "lua5.1" # newer versions do not work with Scribuntu! + apache_site "default" do action [:disable] end @@ -45,7 +47,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"] @@ -54,9 +56,47 @@ 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" +end + +mediawiki_extension "CodeMirror" do + site "wiki.openstreetmap.org" +end + +mediawiki_extension "Scribunto" do + site "wiki.openstreetmap.org" + template "mw-ext-Scribunto.inc.php.erb" + template_cookbook "wiki" +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" + reference "master" +end + +mediawiki_extension "Echo" do + site "wiki.openstreetmap.org" + template "mw-ext-Echo.inc.php.erb" + template_cookbook "wiki" +end + +mediawiki_extension "Thanks" do + site "wiki.openstreetmap.org" + template "mw-ext-Thanks.inc.php.erb" + template_cookbook "wiki" +end + +mediawiki_extension "TimedMediaHandler" do site "wiki.openstreetmap.org" - template "mw-ext-MobileFrontend.inc.php.erb" end cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do @@ -78,21 +118,16 @@ cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do mode 0o644 end -directory "/srv/dump.wiki.openstreetmap.org" do +directory "/srv/wiki.openstreetmap.org/dump" do owner node[:mediawiki][:user] group node[:mediawiki][:group] mode "0775" end -apache_site "dump.wiki.openstreetmap.org" do - template "apache_wiki_dump.erb" - directory "/srv/dump.wiki.openstreetmap.org" - variables :aliases => "dump.wiki.osm.org" -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" + source "wiki-dump.erb" + variables :directory => "/srv/wiki.openstreetmap.org" end