X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fcats%2Fgrant_postgresql_privileges.in;h=f39725ddc0959da160aacff1c43f973eca9b106b;hb=57c3794986e8cd011788c1ea3bded6bf3bcfa431;hp=02c18fb8e5cf518ca186d89e8c9d1f5226bb987e;hpb=cfb521c58b4a543c6d973a7e181604c8b6285040;p=bacula%2Fbacula

diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index 02c18fb8e5..f39725ddc0 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -2,45 +2,68 @@
 #
 # shell script to grant privileges to the bacula database
 #
-USER=bacula
-bindir=@SQL_BINDIR@
+db_user=${db_user:-@db_user@}
+bindir=@POSTGRESQL_BINDIR@
+db_name=${db_name:-@db_name@}
+db_password=@db_password@
+if [ "$db_password" != "" ]; then
+   pass="password '$db_password'"
+fi
 
-if $bindir/psql $* bacula -f - <<END-OF-DATA
 
-create user ${USER};
+$bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
--- for tables
-grant all on unsavedfiles to ${USER};
-grant all on basefiles	  to ${USER};
-grant all on jobmedia	  to ${USER};
-grant all on file	  to ${USER};
-grant all on job	  to ${USER};
-grant all on media	  to ${USER};
-grant all on client	  to ${USER};
-grant all on pool	  to ${USER};
-grant all on fileset	  to ${USER};
-grant all on path	  to ${USER};
-grant all on filename	  to ${USER};
-grant all on counters	  to ${USER};
-grant all on version	  to ${USER};
-grant all on cdimages	  to ${USER};
+create user ${db_user} ${pass};
 
+-- for tables
+grant all on unsavedfiles to ${db_user};
+grant all on basefiles	  to ${db_user};
+grant all on jobmedia	  to ${db_user};
+grant all on file	  to ${db_user};
+grant all on job	  to ${db_user};
+grant all on media	  to ${db_user};
+grant all on client	  to ${db_user};
+grant all on pool	  to ${db_user};
+grant all on fileset	  to ${db_user};
+grant all on path	  to ${db_user};
+grant all on filename	  to ${db_user};
+grant all on counters	  to ${db_user};
+grant all on version	  to ${db_user};
+grant all on cdimages	  to ${db_user};
+grant all on mediatype	  to ${db_user};
+grant all on storage	  to ${db_user};
+grant all on device	  to ${db_user};
+grant all on status	  to ${db_user};
+grant all on location	  to ${db_user};
+grant all on locationlog  to ${db_user};
+grant all on log	  to ${db_user};
+grant all on jobhisto	  to ${db_user};
+grant all on PathHierarchy  to ${db_user};
+grant all on PathVisibility to ${db_user};
+grant all on RestoreObject to ${db_user};
 -- for sequences on those tables
 
-grant select, update on filename_filenameid_seq to ${USER};
-grant select, update on path_pathid_seq 	to ${USER};
-grant select, update on fileset_filesetid_seq	to ${USER};
-grant select, update on pool_poolid_seq 	to ${USER};
-grant select, update on client_clientid_seq	to ${USER};
-grant select, update on media_mediaid_seq	to ${USER};
-grant select, update on job_jobid_seq		to ${USER};
-grant select, update on file_fileid_seq 	to ${USER};
-grant select, update on jobmedia_jobmediaid_seq to ${USER};
-grant select, update on basefiles_baseid_seq	to ${USER};
-
+grant select, update on filename_filenameid_seq    to ${db_user};
+grant select, update on path_pathid_seq 	   to ${db_user};
+grant select, update on fileset_filesetid_seq	   to ${db_user};
+grant select, update on pool_poolid_seq 	   to ${db_user};
+grant select, update on client_clientid_seq	   to ${db_user};
+grant select, update on media_mediaid_seq	   to ${db_user};
+grant select, update on job_jobid_seq		   to ${db_user};
+grant select, update on file_fileid_seq 	   to ${db_user};
+grant select, update on jobmedia_jobmediaid_seq    to ${db_user};
+grant select, update on basefiles_baseid_seq	   to ${db_user};
+grant select, update on storage_storageid_seq	   to ${db_user};
+grant select, update on mediatype_mediatypeid_seq  to ${db_user};
+grant select, update on device_deviceid_seq	   to ${db_user};
+grant select, update on location_locationid_seq    to ${db_user};
+grant select, update on locationlog_loclogid_seq   to ${db_user};
+grant select, update on log_logid_seq		   to ${db_user};
+grant select, update on restoreobject_restoreobjectid_seq to ${db_user};
 END-OF-DATA
+if [ $? -eq 0 ]
 then
-   echo "Privileges for ${USER} granted."
+   echo "Privileges for user ${db_user} granted on database ${db_name}."
    exit 0
 else
    echo "Error creating privileges."