From: Bruno Friedmann <bruno@ioda-net.ch>
Date: Thu, 16 Feb 2012 15:51:38 +0000 (+0100)
Subject: Tweak name of the database
X-Git-Tag: Release-7.0.0~217
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dbca5d4d1de675e21006713571baaea82755312f;p=bacula%2Fbacula

Tweak name of the database

Add instructions for creating the database
Add dir_user and dir_group as owner in case of non-root

Signed-off-by: Bruno Friedmann <bruno@ioda-net.ch>
Signed-off-by: Marco van Wieringen <mvw@planets.elm.net>
---

diff --git a/bacula/src/cats/create_sqlite3_database.in b/bacula/src/cats/create_sqlite3_database.in
index c8b35d48d5..30bc0bdfba 100644
--- a/bacula/src/cats/create_sqlite3_database.in
+++ b/bacula/src/cats/create_sqlite3_database.in
@@ -8,5 +8,9 @@ cd @working_dir@
 db_name=@db_name@
 
 sqlite3 $* ${db_name}.db <<END-OF-DATA
+.databases
 END-OF-DATA
+# Allow non root access
+chown @dir_user@:@dir_group@ ${db_name}.db
+chmod 0640 ${db_name}.db
 exit 0
diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in
index 2d3cca5332..6f6a43eb41 100644
--- a/bacula/src/cats/update_sqlite3_tables.in
+++ b/bacula/src/cats/update_sqlite3_tables.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Shell script to update MySQL tables from Bacula Community version 5.0.x to 5.2.x
+# Shell script to update sqlite3 tables from Bacula Community version 5.0.x to 5.2.x
 #
 echo " "
-echo "This script will update a Bacula MySQL database from version 12 to 14"
+echo "This script will update a Bacula sqlite3 database from version 12 to 14"
 echo "	which is needed to convert from Bacula Community version 5.0.x to 5.2.x"
 echo " "