X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/de23cf1d7f7dcdae563ab4b89e94437f6169286b..a1780627367305e7bd8987ad71fec090cda8743f:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index dfe7a966f..5e15212e0 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -23,6 +23,10 @@ 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 action [:disable] end @@ -33,8 +37,6 @@ mediawiki_site "wiki.openstreetmap.org" do "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"] directory "/srv/wiki.openstreetmap.org" - ssl_enabled TRUE - database_name "wiki" database_user "wiki-user" database_password passwords["database"] @@ -56,6 +58,46 @@ 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 + site "wiki.openstreetmap.org" + template "mw-ext-MobileFrontend.inc.php.erb" +end + +mediawiki_extension "CodeEditor" 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 + cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] @@ -75,21 +117,16 @@ cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do mode 0o644 end -directory "/srv/dump.wiki.openstreetmap.org" do +directory dump_directory 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 owner "root" group "root" mode 0o644 source "cron_wiki_dump.erb" + variables :dumppath => dump_directory end