From 108938c17a7a132ac6f42aa5a9716cc706b46567 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Mon, 21 Mar 2022 13:51:01 -0700
Subject: [PATCH] Release 3.0.12 - See CHANGELOG.md

---
 CHANGELOG.md                                    |  6 ++++++
 install/assets/functions/10-db-backup           | 15 ++++++++++++++-
 install/etc/services.available/10-db-backup/run |  3 ++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eea99d2..bd4733c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.0.12 2022-03-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Throw Errors for MANUAL mode when certain other CONTAINER_* services are enabled
+
+
 ## 3.0.11 2022-03-21 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index b9c9e6a..841590e 100755
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -460,7 +460,7 @@ setup_mode() {
     if [ "${MODE,,}" = "auto" ] || [ ${MODE,,} = "default" ] ; then
         print_debug "Running in Auto / Default Mode - Letting Image control scheduling"
     else
-        print_info "Running in Manual mode - Execute 'backup_now' to run a manual backup"
+        print_info "Running in Manual mode - Execute 'backup_now' or '/etc/services.available/10-db-backup/run' to perform a manual backup"
         service_stop 10-db-backup
         if var_true "${MANUAL_RUN_FOREVER}" ; then
             mkdir -p /etc/services.d/99-run_forever
@@ -472,6 +472,19 @@ do
 done
 EOF
             chmod +x /etc/services.d/99-run_forever/run
+        else
+            if var_true "${CONTAINER_ENABLE_SCHEDULING}" ; then
+                print_error "Manual / Exit after execution mode doesn't work with 'CONTAINER_ENABLE_SCHEDULING=TRUE'"
+                exit 1
+            fi
+            if var_true "${CONTAINER_ENABLE_MONITORING}" ; then
+                print_error "Manual / Exit after execution mode doesn't work with 'CONTAINER_ENABLE_MONITORING=TRUE'"
+                exit 1
+            fi
+            if var_true "${CONTAINER_ENABLE_LOGSHIPPING}" ; then
+                print_error "Manual / Exit after execution mode doesn't work with 'CONTAINER_ENABLE_LOGSHIPPING=TRUE'"
+                exit 1
+            fi
         fi
     fi
 }
\ No newline at end of file
diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run
index 6d0e749..c2dd2bb 100755
--- a/install/etc/services.available/10-db-backup/run
+++ b/install/etc/services.available/10-db-backup/run
@@ -11,6 +11,7 @@ bootstrap_variables
 if [ "${MODE,,}" = "manual" ] ; then
     DB_DUMP_BEGIN=+0
     manual=TRUE
+    print_debug "Detected Manual Mode"
 fi
 
 case "${1,,}" in
@@ -32,7 +33,7 @@ case "${1,,}" in
         :
     ;;
     * )
-        if [ "${manual,,}" = "true" ]; then
+        if [ "${manual,,}" != "true" ]; then
             current_time=$(date +"%s")
             today=$(date +"%Y%m%d")