From cd4cfc9206d7c3a0ea34a452e65397df1c5598f0 Mon Sep 17 00:00:00 2001 From: MrDave Date: Fri, 26 Sep 2025 15:11:16 -0700 Subject: [PATCH] Add SQLite3 default database --- data/motion-dist.conf.in | 11 +++++++++++ src/conf.cpp | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/motion-dist.conf.in b/data/motion-dist.conf.in index d95b391a..542e2195 100644 --- a/data/motion-dist.conf.in +++ b/data/motion-dist.conf.in @@ -93,6 +93,17 @@ webcontrol_parms 2 stream_preview_scale 100 stream_preview_method combined +;************************************************* +;***** Database +;************************************************* +database_type sqlite3 +database_dbname @localstatedir@/lib/@PACKAGE_NAME@/motion.db +database_host localhost +database_port 0 +database_user +database_password +database_busy_timeout 0 + ;************************************************* ; Device config files - One for each device. ;************************************************* diff --git a/src/conf.cpp b/src/conf.cpp index e94bcbaa..ba23f5c5 100644 --- a/src/conf.cpp +++ b/src/conf.cpp @@ -2771,7 +2771,7 @@ void cls_config::edit_stream_scan_scale(std::string &parm, enum PARM_ACT pact) void cls_config::edit_database_type(std::string &parm, enum PARM_ACT pact) { if (pact == PARM_ACT_DFLT) { - database_type = ""; + database_type = "sqlite3"; } else if (pact == PARM_ACT_SET) { if ((parm == "mariadb") || (parm == "") || (parm == "postgresql") || (parm == "sqlite3")) { @@ -2793,7 +2793,7 @@ void cls_config::edit_database_type(std::string &parm, enum PARM_ACT pact) void cls_config::edit_database_dbname(std::string &parm, enum PARM_ACT pact) { if (pact == PARM_ACT_DFLT) { - database_dbname = ""; + database_dbname = std::string( configdir ) + std::string("/motion.db"); } else if (pact == PARM_ACT_SET) { database_dbname = parm; } else if (pact == PARM_ACT_GET) {