Skip to content

Commit 96a8af2

Browse files
committed
Use our standard script to create database
1 parent 0dc0d05 commit 96a8af2

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

.github/jobs/baseinstall.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,10 @@ cat ~/.my.cnf
7474
# TODO: Remove after fixing https://github.com/DOMjudge/domjudge/issues/2848
7575
mysql_log "SET GLOBAL innodb_snapshot_isolation = OFF;"
7676

77-
mysql_log "CREATE DATABASE IF NOT EXISTS \`$DATABASE_NAME\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
78-
mysql_log "CREATE USER IF NOT EXISTS \`domjudge\`@'%' IDENTIFIED BY 'domjudge';"
79-
mysql_log "GRANT SELECT, INSERT, UPDATE, DELETE ON \`$DATABASE_NAME\`.* TO 'domjudge'@'%';"
80-
mysql_log "FLUSH PRIVILEGES;"
8177
echo "unused:sqlserver:$DATABASE_NAME:domjudge:"'domjudge_db-pw+% #$*)@(!/;,.:3306' > /opt/domjudge/domserver/etc/dbpasswords.secret
8278

79+
/opt/domjudge/domserver/bin/dj_setup_database create-db-users
80+
8381
# Show some MySQL debugging
8482
mysql_log "show databases"
8583
mysql_log "SELECT CURRENT_USER();"
@@ -96,7 +94,6 @@ if [ "${db}" = "install" ]; then
9694
section_end
9795
elif [ "${db}" = "upgrade" ]; then
9896
section_start "Upgrade DOMjudge database"
99-
/opt/domjudge/domserver/bin/dj_setup_database update-password
10097
/opt/domjudge/domserver/bin/dj_setup_database upgrade
10198
/opt/domjudge/domserver/webapp/bin/console domjudge:reset-user-password admin "${ADMIN_PASSWORD}"
10299
section_end

0 commit comments

Comments
 (0)