X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fsrc%2Fcats%2Fgrant_postgresql_privileges.in;h=5480903bef612fcfb378176aa9b094244c84b01a;hb=7719dc64fae4bdf54aa7220fe01053fcd54fc34d;hp=fc69abd1f11d1bfa366487ada2b5b6d091b465ba;hpb=e2a19cf54a68b09d336140af29b78a3097bce95d;p=bacula%2Fbacula

diff --git a/bacula/src/cats/grant_postgresql_privileges.in b/bacula/src/cats/grant_postgresql_privileges.in
index fc69abd1f1..5480903bef 100644
--- a/bacula/src/cats/grant_postgresql_privileges.in
+++ b/bacula/src/cats/grant_postgresql_privileges.in
@@ -2,45 +2,61 @@
 #
 # shell script to grant privileges to the bacula database
 #
-USER=bacula
+db_user=${db_user:-@db_user@}
 bindir=@SQL_BINDIR@
+db_name=${db_name:-@db_name@}
 
-if $bindir/psql $* -f - <<END-OF-DATA
-\c bacula
+$bindir/psql -f - -d ${db_name} $* <<END-OF-DATA
 
-create user ${USER};
+create user ${db_user};
 
 -- 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 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};
 -- 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};
 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."