summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-22 13:50:50 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-04-23 15:36:42 +0000
commit2831109ad7398fd5d7a86559b4ba3eb3a85ebb8e (patch)
treebc384a59d6473a7f1c24da16af2194788acab438
parent810fb85f4bbe4c848a2c83bcf3b4be05625ecdbb (diff)
downloadtrove-setup-2831109ad7398fd5d7a86559b4ba3eb3a85ebb8e.tar.gz
Add script to remove lorry-controller from lorry's crontab
-rw-r--r--Makefile2
-rwxr-xr-xlibexecs/remove-lorry-controller-from-lorry-crontab22
2 files changed, 24 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 98fc86b..3a64344 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,8 @@ install:
ln -s /usr/share/lorry-controller/static/ "${DESTDIR}/var/www/htdocs/lc-static"
mkdir -p "${DESTDIR}/usr/bin"
cp bins/* "${DESTDIR}/usr/bin/"
+ mkdir -p "${DESTDIR}/usr/libexec"
+ cp libexecs/* "${DESTDIR}/usr/libexec/"
mkdir -p "${DESTDIR}/usr/share/trove-setup"
cp -r share/* "${DESTDIR}/usr/share/trove-setup/"
diff --git a/libexecs/remove-lorry-controller-from-lorry-crontab b/libexecs/remove-lorry-controller-from-lorry-crontab
new file mode 100755
index 0000000..8fc6cf3
--- /dev/null
+++ b/libexecs/remove-lorry-controller-from-lorry-crontab
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Trove used to run a version of Lorry Controller that wasn't a
+# daemon, but instead was invoked once a minute from a crontab owned
+# by the lorry user. When we upgrade to a version of Lorry Controller
+# that does run as a daemon, we need to disable the cronjob. This
+# script does that.
+#
+# The lorry user crontab may contain other jobs, so we can't just
+# willy-nilly delete the whole crontab. Instead, we remove the
+# specific line. The line looks like this:
+#
+# */1 * * * * flock -x -n /home/lorry/lorry-controller-area/lockfile
+# -c lorry-controller --work-area=/home/lorry/lorry-controller-area
+# --log=syslog --log-level=info --html-file=/home/lorry/lc-status.html
+#
+# Except, of course, all on one line.
+
+
+crontab -l |
+grep -v -e '-c lorry-controller' |
+crontab -