File tree Expand file tree Collapse file tree 3 files changed +3
-10
lines changed Expand file tree Collapse file tree 3 files changed +3
-10
lines changed Original file line number Diff line number Diff line change @@ -64,9 +64,7 @@ mysql_root "show databases"
6464mysql_root " SELECT CURRENT_USER();"
6565mysql_root " SELECT USER();"
6666mysql_root " SELECT user,host FROM mysql.user"
67- echo " unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
68- mysql_user " SELECT CURRENT_USER();"
69- mysql_user " SELECT USER();"
67+ echo ' unused:sqlserver:domjudge:domjudge:domjudge_db-pw+% #$*)@(!/;,.:3306' > /opt/domjudge/domserver/etc/dbpasswords.secret
7068section_end
7169
7270if [ " ${db} " = " install" ]; then
@@ -75,6 +73,7 @@ if [ "${db}" = "install" ]; then
7573 section_end
7674elif [ " ${db} " = " upgrade" ]; then
7775 section_start " Upgrade DOMjudge database"
76+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot update-password
7877 /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
7978 section_end
8079fi
@@ -139,4 +138,3 @@ elif [ "$version" = "all" ]; then
139138 mysql_root " UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
140139fi
141140section_end
142-
Original file line number Diff line number Diff line change @@ -29,11 +29,6 @@ mysql_root () {
2929 echo " $1 " | mysql -uroot -proot ${2:- } | tee -a " $ARTIFACTS " /mysql.txt
3030}
3131
32- mysql_user () {
33- # shellcheck disable=SC2086
34- echo " $1 " | mysql -udomjudge -pdomjudge ${2:- } | tee -a " $ARTIFACTS " /mysql.txt
35- }
36-
3732section_start () {
3833 if [ " $# " -ne 1 ]; then
3934 echo " Only 1 argument is needed for GHA, 2 was needed for GitLab."
Original file line number Diff line number Diff line change 3333
3434# Generate a dbpasswords file
3535# Note that this does not use ${DATABASE_NAME} since Symfony adds the _test postfix itself
36- echo " unused:sqlserver:domjudge:domjudge:domjudge :3306" > etc/dbpasswords.secret
36+ echo ' unused:sqlserver:domjudge:domjudge:domjudge_+% #$*)@(!/;,. :3306' > etc/dbpasswords.secret
3737
3838# Generate APP_SECRET for symfony
3939# shellcheck disable=SC2164
You can’t perform that action at this time.
0 commit comments