X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3535055f669970b9991c63487c27b9fe382a8c60..0751a4f9434ce69a40996fbec967501fe43e4f83:/cookbooks/wiki/recipes/default.rb diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb index 3d8da434d..287a645f6 100644 --- a/cookbooks/wiki/recipes/default.rb +++ b/cookbooks/wiki/recipes/default.rb @@ -1,8 +1,8 @@ # -# 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. @@ -17,8 +17,6 @@ # limitations under the License. # -# include_recipe "squid" - include_recipe "mediawiki" passwords = data_bag_item("wiki", "passwords") @@ -78,7 +76,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 @@ -130,10 +128,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