From ece798d8eac3bf2d874e3ab6300de2941981fc03 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 17 Feb 2014 00:31:37 +0000 Subject: [PATCH] Run taginfo updates from a daily cron job --- cookbooks/taginfo/recipes/default.rb | 13 +++++++++++-- cookbooks/taginfo/templates/default/cron.erb | 9 +++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 cookbooks/taginfo/templates/default/cron.erb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index ee3d887fe..d6c0dd53b 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -46,6 +46,13 @@ gem_package "sinatra" gem_package "sinatra-r18n" gem_package "rack-contrib" +template "/etc/cron.d/taginfo" do + source "cron.erb" + owner "root" + group "root" + mode 0644 +end + directory "/var/log/taginfo" do owner "taginfo" group "taginfo" @@ -66,7 +73,7 @@ node[:taginfo][:sites].each do |site| icon = site[:icon] contact = site[:contact] - directory "/var/log/taginfo/#{site}" do + directory "/var/log/taginfo/#{name}" do owner "taginfo" group "taginfo" mode 0755 @@ -100,9 +107,11 @@ node[:taginfo][:sites].each do |site| settings["instance"]["description"] = description settings["instance"]["icon"] = "/img/logo/#{icon}.png" settings["instance"]["contact"] = contact - settings["logging"]["directory"] = "/var/log/taginfo/#{site}" + settings["logging"]["directory"] = "/var/log/taginfo/#{name}" settings["opensearch"]["shortname"] = "Taginfo" settings["opensearch"]["contact"] = "webmaster@openstreetmap.org" + settings["sources"]["download"] = "" + settings["sources"]["create"] = "db languages josm potlatch wiki" settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf" settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats" settings["tagstats"]["cxxflags"] = "-I../../osmium/include" diff --git a/cookbooks/taginfo/templates/default/cron.erb b/cookbooks/taginfo/templates/default/cron.erb new file mode 100644 index 000000000..b80cdf873 --- /dev/null +++ b/cookbooks/taginfo/templates/default/cron.erb @@ -0,0 +1,9 @@ +# DO NOT EDIT - This file is being maintained by Chef + +<% node[:taginfo][:sites].each do |site| -%> +<% if site[:directory] -%> +0 1 * * * taginfo <%= site[:directory] %>/bin/update +<% else -%> +0 1 * * * taginfo /srv/<%= site[:name] %>/bin/update +<% end -%> +<% end -%> -- 2.43.2