Use our standard script to create database

eldering · eldering · commit 281bcfaa9bf2 · 2024-11-24T15:49:13.000+01:00
diff --git a/.github/jobs/baseinstall.sh b/.github/jobs/baseinstall.sh
@@ -54,19 +54,15 @@ password=root
 EOF
 cat ~/.my.cnf
 
-mysql_root "CREATE DATABASE IF NOT EXISTS \`domjudge\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
-mysql_root "CREATE USER IF NOT EXISTS \`domjudge\`@'%' IDENTIFIED BY 'domjudge';"
-mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`domjudge\`.* TO 'domjudge'@'%';"
-mysql_root "FLUSH PRIVILEGES;"
+echo 'unused:sqlserver:domjudge:domjudge:domjudge_db-pw+% #$*)@(!/;,.:3306' > /opt/domjudge/domserver/etc/dbpasswords.secret
+
+/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot create-db-users
 
 # Show some MySQL debugging
 mysql_root "show databases"
 mysql_root "SELECT CURRENT_USER();"
 mysql_root "SELECT USER();"
 mysql_root "SELECT user,host FROM mysql.user"
-echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
-mysql_user "SELECT CURRENT_USER();"
-mysql_user "SELECT USER();"
 section_end
 
 if [ "${db}" = "install" ]; then
@@ -139,4 +135,3 @@ elif [ "$version" = "all" ]; then
     mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
 fi
 section_end
-
