Skip to content

Commit 6fc3877

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

7 files changed

Lines changed: 62 additions & 444 deletions

File tree

.github/workflows/build-lxd.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ jobs:
267267
set -x
268268
export GECKODRIVER_PATH="$GECKODRIVER_PATH"
269269
export FF_BINARY_PATH="$(which firefox)"
270+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc config:system:set overwrite.cli.url --value "https://nextcloudpi.local"
270271
sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
271272
../.venv/bin/python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
272273
echo "Activation test failed!"
@@ -319,7 +320,6 @@ jobs:
319320
320321
sudo "$LXC" exec ncp -- bash -c "DBG=x ncp-update ${UPDATE_ARGS[*]}"
321322
sudo "$LXC" exec ncp -- /usr/local/bin/ncc status
322-
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
323323
324324
if [[ "$current_nc_version" =~ "$latest_nc_version".* ]]
325325
then
@@ -367,6 +367,7 @@ jobs:
367367
sudo "$LXC" exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
368368
export GECKODRIVER_PATH="$GECKODRIVER_PATH"
369369
export FF_BINARY_PATH="$(which firefox)"
370+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
370371
../.venv/bin/python nextcloud_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
371372
echo "Nextcloud test failed!"
372373
echo "Geckodriver logs:"
@@ -380,8 +381,16 @@ jobs:
380381
sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
381382
exit 1
382383
}
383-
USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --non-interactive || {
384+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
385+
USE_INCUS="$USE_INCUS" ../.venv/bin/python system_tests.py --skip-update-test --non-interactive || {
384386
echo "System test failed!"
387+
sudo "$LXC" exec ncp -- /usr/local/bin/ncc notify_push:self-test
388+
echo "ncp.log: "
389+
sudo "$LXC" exec ncp -- bash -c "tail -n20 /var/log/ncp.log" || true
390+
echo "================"
391+
echo "nextcloud log: "
392+
datadir="$(sudo "$LXC" exec ncp -- ncc config:system:get datadirectory)"
393+
sudo "$LXC" exec ncp -- cat "$datadir/nextcloud.log" || true
385394
exit 1
386395
}
387396
sudo "$LXC" stop ncp

ncp-activation/CSS.css

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

0 commit comments

Comments
 (0)