From a13f6cc04896849b807c8e56d87a3c0f864c030a Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Mon, 20 Mar 2023 22:39:05 +0200
Subject: [PATCH] fix command line

---
 files/process_motion_event.sh | 2 +-
 templates/motion_hass.conf.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/process_motion_event.sh b/files/process_motion_event.sh
index 34ef82b..1acbd68 100644
--- a/files/process_motion_event.sh
+++ b/files/process_motion_event.sh
@@ -231,7 +231,7 @@ fi
 if [ -n "${ntfy_server}" ]; then
   ntfy_password="$(cat "${ntfy_password_file}")"
   ntfy_data="${data}, \"topic\": \"motion_detection\""
-  message "Sending event to ntfy server '${ntfy_server}' ..."
+  message "Sending event to ntfy server '${ntfy_server}/motion_detection' ..."
   curl -s "${ntfy_server}" -d "${ntfy_data}"
   return_code=$?
   if [ $return_code != 0 ]; then
diff --git a/templates/motion_hass.conf.j2 b/templates/motion_hass.conf.j2
index 2e0b612..8a0b527 100644
--- a/templates/motion_hass.conf.j2
+++ b/templates/motion_hass.conf.j2
@@ -2,4 +2,4 @@ hass_token='{{ vault_haos_api_calls_token }}'
 hass_uri='{{ home_assistant_server_uri }}'
 motion_config='/etc/motion/motion.conf'
 # debug_level='DEBUG'
-on_movie_end="/usr/local/bin/process_motion_event.sh --ntfy-server '{{ motion_bot_ntfy_server }}' --ntfy-user '{{ motion_bot_ntfy_username }}' --ntfy-password-file '{{ motion_bot_ntfy_password_file }}' --move-to /srv/expendable_data/motion 192.168.1.251:/srv/expendable_data/ --move-to-port 1122 --remove-picture --email-destination '{{ recipient }}' --home-assistant-url http://192.168.1.248:8123 --home-assistant-token '{{ vault_haos_api_calls_token }}' --signal-destination '+358401871182' -e 'on_movie_end' -t '%t' -w '%w' -J '%J' -i '%i' -C '%C' -o '%o' -c '%$' -v '%v' -D '%D' -h '%h' -K '%K' -L '%L' -f '%f' -Q '%Q' -F '%fps' -q '%q' -N '%N' -n '%n' -h '%host'"
+on_movie_end="/usr/local/bin/process_motion_event.sh --ntfy-server '{{ motion_bot_ntfy_server }}' --ntfy-user '{{ motion_bot_ntfy_username }}' --ntfy-password-file '{{ motion_bot_ntfy_password_file }}' --remove-picture --email-destination '{{ recipient }}' --home-assistant-url '{{ home_assistant_server_uri }}' --home-assistant-token '{{ vault_haos_api_calls_token }}' --signal-destination '+358401871182' -e 'on_movie_end' -t '%t' -w '%w' -J '%J' -i '%i' -C '%C' -o '%o' -c '%$' -v '%v' -D '%D' -h '%h' -K '%K' -L '%L' -f '%f' -Q '%Q' -F '%fps' -q '%q' -N '%N' -n '%n' -h '%host'"