File config_path.patch of Package python-zm_database_init
diff -Pdpru zoneminder-rpm-database-init-3.3.3.orig/config/zm_database_init.conf zoneminder-rpm-database-init-3.3.3/config/zm_database_init.conf
--- zoneminder-rpm-database-init-3.3.3.orig/config/zm_database_init.conf 2020-06-16 17:03:35.000000000 +0200
+++ zoneminder-rpm-database-init-3.3.3/config/zm_database_init.conf 2021-06-18 10:13:39.953109438 +0200
@@ -7,7 +7,7 @@ apache-service = apache2.service
[ZoneMinder]
data-install-path = /usr/share/zoneminder
-configuration-file = /etc/zm.conf
+configuration-file = /etc/zoneminder/zm.conf
lock-file = %(data-install-path)s/lock
version-file = %(data-install-path)s/version
create-database-sql-file = %(data-install-path)s/db/zm_create.sql
diff -Pdpru zoneminder-rpm-database-init-3.3.3.orig/setup.py zoneminder-rpm-database-init-3.3.3/setup.py
--- zoneminder-rpm-database-init-3.3.3.orig/setup.py 2020-06-16 17:03:35.000000000 +0200
+++ zoneminder-rpm-database-init-3.3.3/setup.py 2021-06-18 10:22:03.783608423 +0200
@@ -10,7 +10,7 @@ setup(name="zm_database_init",
packages=["zm_dbinit"],
package_dir={"zm_dbinit": "src/zm_dbinit"},
scripts=["src/scripts/zm_database_init"],
- data_files=[("/etc", ["config/zm_database_init.conf"])],
+ data_files=[("/etc/zoneminder", ["config/zm_database_init.conf"])],
classifiers=["Development Status :: 4 - Beta",
"Environment :: Console",
"License :: GPLv2",
diff -Pdpru zoneminder-rpm-database-init-3.3.3.orig/src/scripts/zm_database_init zoneminder-rpm-database-init-3.3.3/src/scripts/zm_database_init
--- zoneminder-rpm-database-init-3.3.3.orig/src/scripts/zm_database_init 2020-06-16 17:03:35.000000000 +0200
+++ zoneminder-rpm-database-init-3.3.3/src/scripts/zm_database_init 2021-06-18 10:15:25.655259129 +0200
@@ -23,9 +23,9 @@ def main():
parser = argparse.ArgumentParser(description = "Handles Database installation and update for ZoneMinder Installations (Version " + VERSION + ")")
parser.add_argument("-m", "--mysql_host", dest = "mysql_host", default = "localhost", metavar = "MYSQL_HOST",
help="Specify a different MYSQL_HOST (default: localhost)")
- parser.add_argument("-f", "--config-file", dest = "config_file", default = "/etc/zm_database_init.conf",
+ parser.add_argument("-f", "--config-file", dest = "config_file", default = "/etc/zoneminder/zm_database_init.conf",
metavar = "FILE",
- help="Specify a different config FILE (default: /etc/zm_database_init.conf)")
+ help="Specify a different config FILE (default: /etc/zoneminder/zm_database_init.conf)")
parser.add_argument("--non-interactive", dest = "non_interactive",
action = "store_true",
help = "Run in non interactive mode for upgrades only (default: false)")
diff -Pdpru zoneminder-rpm-database-init-3.3.3.orig/src/tests/testConfigs/zm.conf zoneminder-rpm-database-init-3.3.3/src/tests/testConfigs/zm.conf
--- zoneminder-rpm-database-init-3.3.3.orig/src/tests/testConfigs/zm.conf 2020-06-16 17:03:35.000000000 +0200
+++ zoneminder-rpm-database-init-3.3.3/src/tests/testConfigs/zm.conf 2021-06-18 10:16:42.704848917 +0200
@@ -22,7 +22,7 @@ ZM_PATH_BIN=/usr/bin
ZM_PATH_LIB=/usr/lib64
# Path to ZoneMinder configuration (this file only at present)
-ZM_PATH_CONF=/etc
+ZM_PATH_CONF=/etc/zoneminder
# Path to ZoneMinder web files
ZM_PATH_WEB=/srv/www/htdocs/zm
diff -Pdpru zoneminder-rpm-database-init-3.3.3.orig/src/zm_dbinit/configuration.py zoneminder-rpm-database-init-3.3.3/src/zm_dbinit/configuration.py
--- zoneminder-rpm-database-init-3.3.3.orig/src/zm_dbinit/configuration.py 2020-06-16 17:03:35.000000000 +0200
+++ zoneminder-rpm-database-init-3.3.3/src/zm_dbinit/configuration.py 2021-06-18 10:17:04.349304593 +0200
@@ -45,7 +45,7 @@ class Configuration:
return self._readSetting(Configuration.ZmSection, "data-install-path", "/usr/share/zm")
def zmConfigFile(self):
- return self._readSetting(Configuration.ZmSection, "configuration-file", "/etc/zm.conf")
+ return self._readSetting(Configuration.ZmSection, "configuration-file", "/etc/zoneminder/zm.conf")
def installedZmVersionFile(self):
return self._readSetting(Configuration.ZmSection, "version-file", "/usr/share/zm/version")