Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / cookbooks / web / templates / default / statistics.erb

diff --git a/cookbooks/web/templates/default/statistics.erb b/cookbooks/web/templates/default/statistics.erb
index 175f0a9e8d712d7731cbed02923b61d9cbefd4b7..30a23a7ac992698361991becacea9d482343183b 100644 (file)
--- a/cookbooks/web/templates/default/statistics.erb
+++ b/cookbooks/web/templates/default/statistics.erb
@@ -1,10 +1,16 @@
 #!/bin/sh
 
+# Abort on error
+set -e
+
+# Make sure /usr/local/bin is on the path
+export PATH=$PATH:/usr/local/bin
+
 # Generate new statistics
-<%= @directory %>/script/statistics > <%= @directory %>/tmp/data_stats.html
+<%= @ruby %> -W0 <%= @directory %>/script/statistics > <%= @directory %>/tmp/data_stats.html
 
 # Move new statistics into place
-mv -f <%= @directory %>/tmp/data_stats.html /store/rails/stats
+rsync --quiet <%= @directory %>/tmp/data_stats.html planet.openstreetmap.org::statistics
 
 # Mail statistics to Blackadder
-mail -s "OpenStreetMap Statistics" blackadderajr@gmail.com < /store/rails/stats/data_stats.html
+mail -s "OpenStreetMap Statistics" blackadderajr@gmail.com < <%= @directory %>/tmp/data_stats.html