From 64c65902819116d44a8890e7af686e7c2eaa828c Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 1 Apr 2015 22:33:11 +0200
Subject: Run merge.sh under supervisord.

We want the log.
---
 packaging/docker/catlfish-merge/supervisord.conf | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packaging/docker/catlfish-merge/supervisord.conf

(limited to 'packaging/docker/catlfish-merge/supervisord.conf')

diff --git a/packaging/docker/catlfish-merge/supervisord.conf b/packaging/docker/catlfish-merge/supervisord.conf
new file mode 100644
index 0000000..ee4867e
--- /dev/null
+++ b/packaging/docker/catlfish-merge/supervisord.conf
@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+
+[program:catlfish-merge]
+command=/usr/local/catlfish/bin/merge.sh 300 1200 /var/local/db/catlfish-merge
-- 
cgit v1.1