CATS updates to scripts

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@429 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index faf15351b6c3e8ff49ab3cb3b038c71e284972cb..208a7a78046536c8f2c9331258210b962d332cdb 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -21,8 +21,6 @@ For 1.30 release:
 - Update volume=Test01 requests pool, then lists volumes.
 - Add IP address to authentication failures. Implement M_SECURITY
   message class.
-- Remove kern and kelvin from mysql_grant...
-- Install grant_mysql...
 - Look at Python for a Bacula scripting language -- www.python.org
 - add #define ENABLE_NLS for Gnome compile on SuSE.
 - Figure out how to use ssh to protect Bacula communications.
@@ -82,7 +80,7 @@ For 1.30 release:
 - Restore to a particular time -- e.g. before date, after date. 
 - Implement disk spooling
 - Solaris -I on tar for include list
-- Enable avoid backing up archive device (findlib/find_one.c:128)
+- Prohibit backing up archive device (findlib/find_one.c:128)
 - Need a verbose mode in restore, perhaps to bsr.
 - bscan without -v is too quiet -- perhaps show jobs.
 - Add code to reject whole blocks if not wanted on restore.
@@ -110,7 +108,6 @@ For 1.30 release:
 - Add JobLevel in FD status (but make sure it is defined).
 - Make Pool resource handle Counter resources.
 - Remove NextId for SQLite. Optimize.
-- Strip trailing / from Include
 - Move all SQL statements into a single location.
 - Add UA rc and history files.
 - put termcap (used by console) in ./configure and
@@ -915,4 +912,6 @@ rufus-dir: Volume used once. Marking Volume "File0003" as Used.
 - Implement bar code reader for autochangers
 - Document new MaximumConcurrentJob records (Job, Client, Storage) 
 - Write up how to use/manage disk Volume Storage. ******
-
+- Remove kern and kelvin from mysql_grant...
+- Install grant_mysql...
+- Strip trailing / from Include

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 6117b4f33801940804d68a9f777238bb1aeb5086..a5515147c8855e7e6bb3cabbcc7fd154515e5e4c 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -77,6 +77,7 @@ install:
        $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
        $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
        $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
+       $(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges  
 
 uninstall:
        (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
@@ -86,6 +87,7 @@ uninstall:
        (cd $(DESTDIR)$(scriptdir); $(RMF) make_bacula_tables)
        (cd $(DESTDIR)$(scriptdir); $(RMF) make_catalog_backup)
        (cd $(DESTDIR)$(scriptdir); $(RMF) delete_catalog_backup)
+       (cd $(DESTDIR)$(scriptdir); $(RMF) grant_mysql_privileges)
 
 
 # Semi-automatic generation of dependencies:

diff --git a/bacula/src/cats/grant_mysql_privileges.in b/bacula/src/cats/grant_mysql_privileges.in
index b51561bde7b53e4178f7f1ee653fe40c955777e3..0c0c6a597b721beff32a04e858dbb1761471a8df 100644 (file)
--- a/bacula/src/cats/grant_mysql_privileges.in
+++ b/bacula/src/cats/grant_mysql_privileges.in
@@ -1,23 +1,18 @@
 #!/bin/sh
 #
-# shell script to create Bacula database(s)
+# shell script to grant privileges to the bacula database
 #
-
 bindir=@SQL_BINDIR@
 
 if $bindir/mysql $* -u root -f <<END-OF-DATA
 use mysql
-grant all privileges on *.* to kern@localhost with grant option;
-grant all privileges on *.* to kern@"%" with grant option;
-grant all privileges on *.* to kelvin@localhost with grant option;
-grant all privileges on *.* to kelvin@"%" with grant option;
-grant all privileges on *.* to bacula@localhost with grant option;
-grant all privileges on *.* to bacula@"%" with grant option;
+grant all privileges on bacula.* to bacula@localhost with grant option;
+grant all privileges on bacula.* to bacula@"%" with grant option;
 select * from user;
 flush privileges;
 END-OF-DATA
 then
-   echo "Privileges for kern, kelvin, and bacula granted."
+   echo "Privileges for bacula granted."
    exit 0
 else
    echo "Error creating privileges."