X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f5c209a2991b26130dcae5cfcc613be001f5106d..25dbbcc5db8e8cd3c3ca4466b385e471c4984195:/cookbooks/wiki/recipes/default.rb?ds=inline diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 7e9569098..ef0d16b8b 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -33,6 +33,12 @@ mediawiki_site "wiki.openstreetmap.org" do "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"] directory "/srv/wiki.openstreetmap.org" + fpm_max_children 50 + fpm_start_servers 10 + fpm_min_spare_servers 10 + fpm_max_spare_servers 20 + fpm_prometheus_port 9253 + database_name "wiki" database_user "wiki-user" database_password passwords["database"] @@ -47,8 +53,8 @@ mediawiki_site "wiki.openstreetmap.org" do 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." @@ -106,20 +112,20 @@ 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/wiki.openstreetmap.org/dump" do @@ -128,10 +134,9 @@ directory "/srv/wiki.openstreetmap.org/dump" do mode "0775" end -template "/etc/cron.d/wiki-dump" do - owner "root" - group "root" - mode 0o644 - source "wiki-dump.erb" - variables :directory => "/srv/wiki.openstreetmap.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