external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-05 00:27:25 +00:00
Code Issues Releases Wiki Activity

Output formatting changes

Browse Source
This commit is contained in:
downtownallday 2020-06-10 07:21:47 -04:00
parent 8be3011c19
commit f4fda41705
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ before_miab_install() {
# update package lists before installing anything
H2 "apt-get update"
apt-get update || die "apt-get update failed!"
apt-get update -qq || die "apt-get update failed!"
# install prerequisites
H2 "QA prerequisites"
@ -99,23 +99,17 @@ before_miab_install() {
}
debug_output_conf_files() {
dump_log "/etc/mailinabox.conf"
dump_log "/etc/nsd/nsd.conf"
dump_log "/etc/postfix/main.cf"
}
miab_install() {
H1 "MIAB-LDAP INSTALL"
if ! setup/start.sh; then
H1 "OUTPUT OF SELECT FILES"
dump_log "/var/log/syslog" 100
debug_output_conf_files
dump_conf_files
H2; H2 "End"; H2
die "setup/start.sh failed!"
fi
H1 "OUTPUT OF SELECT FILES"
debug_output_conf_files
dump_conf_files
H2; H2 "End"; H2
}

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

@ -9,13 +9,19 @@ die() {
H1() {
local msg="$1"
echo "----------------------------------------------"
if [ ! -z "$msg" ]; then
echo " $msg"
echo "----------------------------------------------"
fi
}
H2() {
local msg="$1"
if [ -z "$msg" ]; then
echo "***"
else
echo "*** $msg ***"
fi
}
dump_log() {
@ -25,7 +31,7 @@ dump_log() {
echo ""
echo "--------"
echo -n "-------- $log_file"
if [ -z "$lines" ]; then
if [ ! -z "$lines" ]; then
echo " (last $line lines)"
else
echo ""
@ -39,6 +45,12 @@ dump_log() {
fi
}
dump_conf_files() {
dump_log "/etc/mailinabox.conf"
dump_log "/etc/nsd/nsd.conf"
dump_log "/etc/postfix/main.cf"
}
install_qa_prerequisites() {
# python3-dnspython: is used by the python scripts in 'tests' and is
# not installed by setup