X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d98904c0d66e4869bd69177f962e3e97b97dd2c3..a24470a145847920ffe3cb6764c93d9192ed8ca0:/cookbooks/wiki/recipes/default.rb?ds=inline diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index e7d7daf3f..064f686cf 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -33,6 +33,8 @@ mediawiki_site "wiki.openstreetmap.org" do "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"] directory "/srv/wiki.openstreetmap.org" + fpm_max_children 25 + database_name "wiki" database_user "wiki-user" database_password passwords["database"] @@ -76,7 +78,7 @@ end mediawiki_extension "OsmWikibase" do site "wiki.openstreetmap.org" - repository "git://github.com/nyurik/OsmWikibase.git" + repository "https://github.com/nyurik/OsmWikibase.git" reference "master" end @@ -106,20 +108,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 +130,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