X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1ca376f593b53960f4963fce4892fe20f8c7e2dd..a24470a145847920ffe3cb6764c93d9192ed8ca0:/cookbooks/wiki/recipes/default.rb?ds=inline diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index dc95c2194..064f686cf 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -1,14 +1,14 @@ # -# 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. # 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, @@ -17,80 +17,122 @@ # limitations under the License. # -#include_recipe "squid" - 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 ] + action [:disable] end -mediawiki_site "wiki.openstreetmap.org" do - aliases "wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net", "wiki.openstreetmap.ca", "wiki.openstreetmap.eu", "wiki.openstreetmap.pro", "wiki.openstreetmaps.org" - directory "/srv/wiki.openstreetmap.org" +mediawiki_site "wiki.openstreetmap.org" do + aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net", + "wiki.openstreetmap.ca", "wiki.openstreetmap.eu", + "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"] + directory "/srv/wiki.openstreetmap.org" + + fpm_max_children 25 - enable_ssl TRUE - database_name "wiki" - database_username "wiki-user" + database_user "wiki-user" database_password passwords["database"] admin_password passwords["admin"] - logo "/osm_logo_wiki.png" + logo "/osm_logo_wiki.png" email_contact "webmaster@openstreetmap.org" - email_sender "wiki@openstreetmap.org" + email_sender "wiki@noreply.openstreetmap.org" email_sender_name "OpenStreetMap Wiki" - metanamespace "OpenStreetMap" + metanamespace "Wiki" - recaptcha_public_key "6Lc9OLsSAAAAAKazGuA9zItboXIHb6ObYOdiVm6o" + recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz" recaptcha_private_key passwords["recaptcha"] - - #site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT." + # site_notice "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." + # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT." +end + +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" + template "mw-ext-Wikibase.inc.php.erb" + template_cookbook "wiki" +end + +mediawiki_extension "OsmWikibase" do + site "wiki.openstreetmap.org" + repository "https://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" +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] - mode 0644 + mode "644" end template "/srv/wiki.openstreetmap.org/robots.txt" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode "644" source "robots.txt.erb" end cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode "644" 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" - }) +cron_d "wiki-dump" do + minute "0" + hour "2" + user "wiki" + command "cd /srv/wiki.openstreetmap.org && php w/maintenance/dumpBackup.php --full --quiet --output=gzip:dump/dump.xml.gz" end - -template "/etc/cron.d/wiki-osm-org-dump" do - owner "root" - group "root" - mode 0644 - source "cron_wiki_dump.erb" -end -