cleanup database population

remove scripts for testdatabase. These have not been used for a long time, and probably do not work anymore anyway. mysql: grant access to different localhost settings (localhost, 127.0.0.1, ::1). Better database password support. Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
bareos · Nov 16, 2013 · da29b79 · da29b79
1 parent 5b1ebf8
commit da29b79
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 199 deletions.
diff --git a/src/cats/create_test_database b/src/cats/create_test_database
diff --git a/src/cats/drop_test_tables b/src/cats/drop_test_tables
diff --git a/src/cats/grant_mysql_privileges.in b/src/cats/grant_mysql_privileges.in
@@ -5,16 +5,17 @@
 db_user=${db_user:-@db_user@}
 bindir=@MYSQL_BINDIR@
 db_name=${db_name:-@db_name@}
-db_password=@db_password@
+db_password=${db_password:-@db_password@}
 if [ "$db_password" != "" ]; then
    pass="identified by '$db_password'"
 fi
 
 if $bindir/mysql $* -u root -f <<END-OF-DATA
 use mysql
-grant all privileges on ${db_name}.* to ${db_user}@localhost ${pass};
-grant all privileges on ${db_name}.* to ${db_user}@"%" ${pass};
-select * from user;
+grant all privileges on ${db_name}.* to ${db_user}@'localhost' ${pass};
+grant all privileges on ${db_name}.* to ${db_user}@'127.0.0.1' ${pass};
+grant all privileges on ${db_name}.* to ${db_user}@'::1' ${pass};
+select user,password,host from mysql.user where user="${db_user}";
 flush privileges;
 END-OF-DATA
 then

diff --git a/src/cats/grant_postgresql_privileges.in b/src/cats/grant_postgresql_privileges.in
@@ -5,7 +5,7 @@
 db_user=${db_user:-@db_user@}
 bindir=@POSTGRESQL_BINDIR@
 db_name=${db_name:-@db_name@}
-db_password=@db_password@
+db_password=${db_password:-@db_password@}
 if [ "$db_password" != "" ]; then
    pass="password '$db_password'"
 fi

diff --git a/src/cats/make_test_tables b/src/cats/make_test_tables