From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jun 2020 10:32:20 +0000 (+0100)
Subject: Suppress output from blog aggregator unless it fails completely
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7053c23557f11a84f98c5b3ee04c6815b2665879

Suppress output from blog aggregator unless it fails completely
---

diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 5cd260d1f..365d84643 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -77,6 +77,13 @@ apache_site "blogs.openstreetmap.org" do
   variables :aliases => ["blogs.osm.org"]
 end
 
+template "/usr/local/bin/blogs-update" do
+  source "blogs-update.erb"
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
 template "/etc/cron.d/blogs" do
   source "cron.erb"
   owner "root"
diff --git a/cookbooks/blogs/templates/default/blogs-update.erb b/cookbooks/blogs/templates/default/blogs-update.erb
new file mode 100644
index 000000000..af245f355
--- /dev/null
+++ b/cookbooks/blogs/templates/default/blogs-update.erb
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+cd /srv/blogs.openstreetmap.org
+
+bundle exec pluto \
+       --quieter \
+       --config=/srv/blogs.openstreetmap.org build \
+       --dbpath=/srv/blogs.openstreetmap.org \
+       --template=osm \
+       --output=/srv/blogs.openstreetmap.org/build \
+       /srv/blogs.openstreetmap.org/planet.ini > log.$$ 2>&1
+
+if [ $? -ne 0 ]
+then
+    cat log.$$
+fi
+
+rm -f log.$$
diff --git a/cookbooks/blogs/templates/default/cron.erb b/cookbooks/blogs/templates/default/cron.erb
index fe4ef2a0e..8cf25fb25 100644
--- a/cookbooks/blogs/templates/default/cron.erb
+++ b/cookbooks/blogs/templates/default/cron.erb
@@ -2,4 +2,4 @@
 
 MAILTO=admins@openstreetmap.org
 
-*/30 * * * * blogs cd /srv/blogs.openstreetmap.org; bundle exec pluto --quieter --config=/srv/blogs.openstreetmap.org build --dbpath=/srv/blogs.openstreetmap.org --template=osm --output=/srv/blogs.openstreetmap.org/build /srv/blogs.openstreetmap.org/planet.ini > /dev/null
+*/30 * * * * blogs /usr/local/bin/blogs-update