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"
64
64
mysql_root " SELECT CURRENT_USER();"
65
65
mysql_root " SELECT USER();"
66
66
mysql_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
70
68
section_end
71
69
72
70
if [ " ${db} " = " install" ]; then
@@ -75,6 +73,7 @@ if [ "${db}" = "install" ]; then
75
73
section_end
76
74
elif [ " ${db} " = " upgrade" ]; then
77
75
section_start " Upgrade DOMjudge database"
76
+ /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot update-password
78
77
/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
79
78
section_end
80
79
fi
@@ -139,4 +138,3 @@ elif [ "$version" = "all" ]; then
139
138
mysql_root " UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
140
139
fi
141
140
section_end
142
-
Original file line number Diff line number Diff line change @@ -29,11 +29,6 @@ mysql_root () {
29
29
echo " $1 " | mysql -uroot -proot ${2:- } | tee -a " $ARTIFACTS " /mysql.txt
30
30
}
31
31
32
- mysql_user () {
33
- # shellcheck disable=SC2086
34
- echo " $1 " | mysql -udomjudge -pdomjudge ${2:- } | tee -a " $ARTIFACTS " /mysql.txt
35
- }
36
-
37
32
section_start () {
38
33
if [ " $# " -ne 1 ]; then
39
34
echo " Only 1 argument is needed for GHA, 2 was needed for GitLab."
Original file line number Diff line number Diff line change 33
33
34
34
# Generate a dbpasswords file
35
35
# 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
37
37
38
38
# Generate APP_SECRET for symfony
39
39
# shellcheck disable=SC2164
You can’t perform that action at this time.
0 commit comments