external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

Move nsd fix for Travis-CI into setup/dns.sh

Browse Source
This commit is contained in:
downtownallday
2020-06-09 23:20:02 -04:00
parent 81c2b75ee4
commit 4d99e6021b
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/assets/system-setup/remote-nextcloud-docker.sh
View File

@@ -102,22 +102,9 @@ before_miab_install() {
miab_install() {
H1 "MIAB-LDAP INSTALL"
if ! setup/start.sh; then
local failure="true"
if [ "$TRAVIS" == "true" ] && tail -10 /var/log/syslog | grep "Exception on /mail/users/add" >/dev/null; then
dump_log "/etc/mailinabox.conf"
H2 "Apply Travis-CI nsd fix"
travis_fix_nsd || die "Could not fix NSD startup issue"
H2 "Re-run firstuser.sh and mods.d/remote-nextcloud.sh"
if setup/firstuser.sh && setup/mods.d/remote-nextcloud.sh; then
failure="false"
fi
fi
if [ "$failure" == "true" ]; then
dump_log "/var/log/syslog" 100
die "setup/start.sh failed!"
fi
dump_log "/var/log/syslog" 100
dump_log "/etc/mailinabox.conf"
die "setup/start.sh failed!"
fi
}
@@ -128,8 +115,8 @@ after_miab_install() {
. /etc/mailinabox.conf || die "Could not load /etc/mailinabox.conf"
# TRAVIS: fix nsd startup problem
H2 "Apply Travis-CI nsd fix"
travis_fix_nsd || die "Could not fix NSD startup issue for TRAVIS-CI"
#H2 "Apply Travis-CI nsd fix"
#travis_fix_nsd || die "Could not fix NSD startup issue for TRAVIS-CI"
# run Nextcloud docker image
H2 "Start Nextcloud docker container"

1
tests/assets/system-setup/setup-funcs.sh
View File

@@ -28,6 +28,7 @@ dump_log() {
H1 "$title"
cat "$log_file"
fi
H1 "END $title"
}
install_qa_prerequisites() {