From d9df4af0fcc91e1988a411892bba0b792ce62427 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 22 May 2015 16:24:51 +0200
Subject: Moving docker stuff to its own repo (catlfish-dockerfiles).

---
 packaging/docker/catlfish-dev/merge.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100755 packaging/docker/catlfish-dev/merge.sh

(limited to 'packaging/docker/catlfish-dev/merge.sh')

diff --git a/packaging/docker/catlfish-dev/merge.sh b/packaging/docker/catlfish-dev/merge.sh
deleted file mode 100755
index 40f623c..0000000
--- a/packaging/docker/catlfish-dev/merge.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-
-# Default intervals
-# - 5m before first merge
-# - 20m between subsequent merges
-S1=300; [ -n "$1" ] && S1=$1
-S2=1200; [ -n "$2" ] && S2=$2
-
-DBDIR="$3"
-
-[ -d $DBDIR ] || mkdir $DBDIR
-[ -d $DBDIR/chains ] || mkdir $DBDIR/chains
-[ -e $DBDIR/logorder ] || touch $DBDIR/logorder
-
-date
-echo "merge: waiting $(expr $S1 / 60)m$(expr $S1 % 60)s before merging for the first time"
-sleep $S1
-
-while true; do
-    echo "$0: merging"
-    date
-    python /usr/local/src/catlfish/tools/merge.py \
-           --config /usr/local/etc/catlfish/system.cfg \
-           --localconfig /usr/local/etc/catlfish/merge.cfg
-    date
-    echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again"
-    sleep $S2
-done
-- 
cgit v1.1