Skip to content

Commit 7d8c359

Browse files
committed
ncp-web: Set domain explicitly to whatever was visited when activating NCP
1 parent d513873 commit 7d8c359

6 files changed

Lines changed: 40 additions & 442 deletions

File tree

.github/workflows/build-lxd.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ jobs:
319319
320320
sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update ${UPDATE_ARGS[*]}"
321321
sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
322-
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
323322
324323
if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
325324
then
@@ -367,6 +366,7 @@ jobs:
367366
sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
368367
export GECKODRIVER_PATH="$GECKODRIVER_PATH"
369368
export FF_BINARY_PATH="$(which firefox)"
369+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
370370
../.venv/bin/python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
371371
echo "Nextcloud test failed!"
372372
echo "Geckodriver logs:"
@@ -380,8 +380,16 @@ jobs:
380380
sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
381381
exit 1
382382
}
383-
USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --non-interactive || {
383+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
384+
USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --skip-update-test --non-interactive || {
384385
echo "System test failed!"
386+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
387+
echo "ncp.log: "
388+
sudo "$LXC" exec ncp -- bash -c "tail -n20 /var/log/ncp.log" || true
389+
echo "================"
390+
echo "nextcloud log: "
391+
datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)"
392+
sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
385393
exit 1
386394
}
387395
sudo "$LXC" stop ncp

ncp-activation/CSS.css

Lines changed: 0 additions & 242 deletions
This file was deleted.

0 commit comments

Comments
 (0)