From 5f47ce7fca0d7b94c89d04249243033683cf7c5d Mon Sep 17 00:00:00 2001 From: Magnus Andersson Date: Tue, 11 Jun 2024 14:12:38 +0200 Subject: [PATCH] Make listusers.sh saml user aware --- templates/mariadb_backup/listusers.erb.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/templates/mariadb_backup/listusers.erb.sh b/templates/mariadb_backup/listusers.erb.sh index 115115a..ec8d794 100644 --- a/templates/mariadb_backup/listusers.erb.sh +++ b/templates/mariadb_backup/listusers.erb.sh @@ -15,9 +15,16 @@ password=$(${dexec} env | grep MYSQL_ROOT_PASSWORD | awk -F '=' '{print $2}') mysql="${dexec} mysql -p${password}" -users="$(${mysql} -NB -e 'select uid,displayname from nextcloud.oc_global_scale_users')" -users="${users} -$(${mysql} -NB -e 'select uid,displayname from nextcloud.oc_users')" +if [[ "$(${mysql} -NB -e 'select exists(select * from information_schema.TABLES where TABLE_SCHEMA = "nextcloud" and TABLE_NAME = "oc_global_scale_users")')" == "1" ]] +then + users="$(${mysql} -NB -e 'select uid,displayname from nextcloud.oc_global_scale_users')" +fi +users="${users}"$'\n'"$(${mysql} -NB -e 'select uid,displayname from nextcloud.oc_users')" +if [[ "$(${mysql} -NB -e 'select exists(select * from information_schema.TABLES where TABLE_SCHEMA = "nextcloud" and TABLE_NAME = "oc_user_saml_users")')" == "1" ]] +then + users="${users}"$'\n'"$(${mysql} -NB -e 'select uid,displayname from nextcloud.oc_user_saml_users')" +fi +users="$(echo "${users}" | sort | uniq)" project="statistics" bucket="drive-server-coms"