From 1696cda1816b529d235981423b818b3505d77ea1 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Tue, 24 Aug 2021 12:00:08 +0200
Subject: [PATCH] fix: [0km] better check to see if compose need to be launched

Signed-off-by: Valentin Lab <valentin.lab@kalysto.org>
---
 bin/0km | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/bin/0km b/bin/0km
index ddbfbb2..6f67bea 100755
--- a/bin/0km
+++ b/bin/0km
@@ -735,11 +735,6 @@ vps_install_backup() {
         return 1
     fi
 
-    already_present=
-    if e "$out" | grep "^II Entry for service .* is already present" >/dev/null 2>&1; then
-        already_present=1
-        info "Backup entry is already present in 'compose.yml' of '$vps'"
-    fi
     out="${out%$'\n'}"
     out="${out#*$'\n'}"
     key="${out%\'*}"
@@ -753,11 +748,22 @@ vps_install_backup() {
         return 1
     fi
 
-    if [ "$type" == "compose" ] && [ -z "$already_present" ]; then
-        ssh:run "root@$vps" -- compose --debug up || {
-            err "Command 'compose --debug up' failed."
-            return 1
-        }
+    if [ "$type" == "compose" ]; then
+        if ! ssh:run "root@$vps" -- \
+             docker exec myc_cron_1 \
+                 cat /etc/cron.d/rsync-backup >/dev/null 2>&1; then
+            ssh:run "root@$vps" -- compose --debug up || {
+                err "Command 'compose --debug up' failed."
+                return 1
+            }
+            if ! ssh:run "root@$vps" -- \
+                 docker exec myc_cron_1 \
+                 cat /etc/cron.d/rsync-backup >/dev/null 2>&1; then
+                err "Launched 'compose up' successfully but ${YELLOW}cron${NORMAL} container is not setup as expected."
+                echo "  Was waiting for existence of '/etc/cron.d/rsync-backup' in it." >&2
+                return 1
+            fi
+        fi
     fi
 
     dest="$server"