Skip to content

Commit 62a84d9

Browse files
committed
Set a more grep-able admin password
Also don't set this explicitly in `workflows/database-upgrade.yml` as it is already set in `jobs/baseinstall.sh` called before. Don't pass admin:password to the API check as it already uses curl with `-n` option to read from `~/.netrc`.
1 parent 77724a4 commit 62a84d9

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/jobs/baseinstall.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ composer install --no-scripts |tee "$ARTIFACTS"/composer_out.txt
1717
cd ..
1818
section_end
1919

20-
section_start "Set simple admin password"
21-
echo "password" > ./etc/initial_admin_password.secret
22-
echo "default login admin password password" > ~/.netrc
20+
section_start "Set admin password"
21+
echo "admin_password" > ./etc/initial_admin_password.secret
22+
echo "default login admin password admin_password" > ~/.netrc
2323
section_end
2424

2525
section_start "Install domserver"

.github/workflows/database-upgrade.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
run: mysql -hsqlserver -uroot -proot < .github/jobs/data/dj733.sql
2929
- name: Upgrade DOMjudge
3030
run: .github/jobs/baseinstall.sh default upgrade
31-
- name: Setting initial Admin Password
32-
run: echo "pass" > /opt/domjudge/domserver/etc/initial_admin_password.secret
3331
- name: Check for Errors in the Upgrade
3432
run: mysql -hsqlserver -uroot -proot -e "SHOW TABLES FROM domjudge;"
3533
- name: Check for Errors in Domjudge Web

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ jobs:
149149
export CCS_SPECS_PINNED_SHA1='a68aff54c4e60fc2bff2fc5c36c119bffa4d30f1'
150150
( cd ccs-specs && git reset --hard $CCS_SPECS_PINNED_SHA1 )
151151
export CHECK_API="${HOME}/ccs-specs/check-api.sh -j ${HOME}/yajsv"
152-
$CHECK_API -n -C -e -a 'strict=1' http://admin:password@localhost/domjudge/api
152+
$CHECK_API -n -C -e -a 'strict=1' http://localhost/domjudge/api

0 commit comments

Comments
 (0)