X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/de23cf1d7f7dcdae563ab4b89e94437f6169286b..40c2e0e03c986bc7bb78adf9b96e6331ad22ed29:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index dfe7a966f..e7a2b3e57 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,12 +17,12 @@ # 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] end @@ -30,10 +30,14 @@ 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" + "wiki.openstreetmap.pro", "wiki.openstreetmaps.org", + "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"] - ssl_enabled TRUE + fpm_max_children 200 + fpm_start_servers 25 + fpm_min_spare_servers 25 + fpm_max_spare_servers 50 + fpm_prometheus_port 9253 database_name "wiki" database_user "wiki-user" @@ -47,49 +51,144 @@ 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"] + hcaptcha_public_key "b67a410b-955e-4049-b432-f9c00e0202c0" + hcaptcha_private_key passwords["hcaptcha"] # 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"] + action :delete +end + +mediawiki_extension "JsonConfig" do + site "wiki.openstreetmap.org" + template "mw-ext-JsonConfig.inc.php.erb" + template_cookbook "wiki" +end + +mediawiki_extension "Kartographer" do + site "wiki.openstreetmap.org" + template "mw-ext-Kartographer.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] - mode 0o644 + mode "644" end template "/srv/wiki.openstreetmap.org/robots.txt" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + 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 0o644 + 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" +systemd_service "wiki-dump" do + description "Wiki dump" + type "oneshot" + exec_start "/usr/bin/php w/maintenance/dumpBackup.php --full --quiet --output=gzip:dump/dump.xml.gz" + working_directory "/srv/wiki.openstreetmap.org" + user "wiki" + sandbox :enable_network => true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" + read_write_paths "/srv/wiki.openstreetmap.org/dump" +end + +systemd_timer "wiki-dump" do + description "Wiki dump" + on_calendar "02:00" +end + +service "wiki-dump.timer" do + action [:enable, :start] +end + +systemd_service "wiki-rdf-dump" do + description "Wiki RDF dump" + type "oneshot" + exec_start [ + "/usr/bin/php w/extensions/Wikibase/repo/maintenance/dumpRdf.php --wiki wiki --format ttl --flavor full-dump --entity-type item --entity-type property --no-cache --output /tmp/wikibase-rdf.ttl", + "/bin/gzip -9 /tmp/wikibase-rdf.ttl", + "/bin/mv /tmp/wikibase-rdf.ttl.gz /srv/wiki.openstreetmap.org/dump/wikibase-rdf.ttl.gz" + ] + working_directory "/srv/wiki.openstreetmap.org" + user "wiki" + sandbox :enable_network => true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" + read_write_paths "/srv/wiki.openstreetmap.org/dump" +end + +systemd_timer "wiki-rdf-dump" do + description "Wiki RDF dump" + on_calendar "04:00" end -template "/etc/cron.d/wiki-osm-org-dump" do - owner "root" - group "root" - mode 0o644 - source "cron_wiki_dump.erb" +service "wiki-rdf-dump.timer" do + action [:enable, :start] end