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

Improve formatting of setup output

Browse Source
This commit is contained in:
downtownallday 2022-03-06 10:53:00 -05:00
parent eb83732000
commit ee8d627c3b
3 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/start.sh
View File

@ -156,7 +156,9 @@ fi
#
if [ -d "${LOCAL_MODS_DIR:-local}" ]; then
for mod in $(ls "${LOCAL_MODS_DIR:-local}" | grep -v '~$'); do
${LOCAL_MODS_DIR:-local}/$mod
if [ -x ${LOCAL_MODS_DIR:-local}/$mod ]; then
${LOCAL_MODS_DIR:-local}/$mod |& sed -e "s/^/mod(${mod%%.*}): /"
fi
done
fi

38
tests/lib/system.sh
View File

@ -49,11 +49,18 @@ dump_file_if_exists() {
}
update_system_time() {
if [ ! -x /usr/sbin/ntpdate ]; then
wait_for_apt
apt-get install -y -qq ntpdate || return 1
if systemctl is-active --quiet ntp; then
# ntpd is running and running ntpdate will fail with "the NTP
# socket is in use"
echo "ntpd is already running, not updating time"
return 0
fi
ntpdate -s ntp.ubuntu.com && echo "System time updated"
if [ ! -x /usr/sbin/ntpdate ]; then
echo "Installing ntpdate"
wait_for_apt
exec_no_output apt-get install -y ntpdate || return 1
fi
ntpdate ntp.ubuntu.com
}
set_system_hostname() {
@ -110,3 +117,26 @@ install_docker() {
|| return 5
}
exec_no_output() {
# This function hides the output of a command unless the command
# fails
local of=$(mktemp)
"$@" &> "$of"
local code=$?
if [ $code -ne 0 ]; then
echo "" 1>&2
echo "FAILED: $@" 1>&2
echo "-----------------------------------------" 1>&2
echo "Return code: $code" 1>&2
echo "Output:" 1>&2
cat "$of" 1>&2
echo "-----------------------------------------" 1>&2
fi
# Remove temporary file.
rm -f "$of"
[ $code -ne 0 ] && return 1
return 0
}

33
tests/system-setup/setup-funcs.sh
View File

@ -2,7 +2,7 @@
#
# requires:
#
# test scripts: [ lib/misc.sh, lib/system.sh ]
# test scripts: [ lib/misc.sh, lib/system.sh, lib/color-output.sh ]
#
@ -81,7 +81,7 @@ init_test_system() {
# update package lists before installing anything
H2 "apt-get update"
wait_for_apt
apt-get update -qq || die "apt-get update failed!"
exec_no_output apt-get update -qq || die "apt-get update failed!"
# upgrade packages - if we don't do this and something like bind
# is upgraded through automatic upgrades (because maybe MiaB was
@ -90,15 +90,24 @@ init_test_system() {
if is_false "$TRAVIS" && [ "$SKIP_SYSTEM_UPDATE" != "1" ]; then
H2 "apt-get upgrade"
wait_for_apt
apt-get upgrade -qq || die "apt-get upgrade failed!"
cp /var/log/apt/history.log /tmp/history.log \
|| die "Unable to copy /var/log/apt/history.log to /tmp"
exec_no_output apt-get upgrade -y --with-new-pkgs \
|| die "apt-get upgrade failed!"
diff /tmp/history.log /var/log/apt/history.log \
| sed 's/^> //' \
| awk '/^(Upgrade|Install): / { print $0 }'
rm -f /tmp/history.log
fi
# install avahi if the system dns domain is .local - note that
# /bin/dnsdomainname returns empty string at this point
case "$PRIMARY_HOSTNAME" in
*.local )
H2 "Install avahi"
wait_for_apt
apt-get install -y -qq avahi-daemon || die "could not install avahi"
exec_no_output apt-get install -y avahi-daemon \
|| die "could not install avahi"
;;
esac
}
@ -131,8 +140,10 @@ init_miab_testing() {
# python3-dnspython: is used by the python scripts in 'tests' and is
# not installed by setup
# also install 'jq' for json processing
echo "Install python3-dnspython, jq"
wait_for_apt
apt-get install -y -qq python3-dnspython jq
exec_no_output apt-get install -y python3-dnspython jq \
|| die "Unable to install setup prerequisites !!"
# copy in pre-built MiaB-LDAP ssl files
# 1. avoid the lengthy generation of DH params
@ -228,12 +239,15 @@ miab_ldap_install() {
# but only when in interactive mode. make sure it's also installed
# in non-interactive mode
if [ ! -z "${NONINTERACTIVE:-}" ]; then
H2 "Install email_validator python3 module"
echo "Install email_validator python3 module"
wait_for_apt
apt-get install -y -qq python3-pip || die "Unable to install pip3!"
pip3 install -q "email_validator>=1.0.0" || die "Unable to install email_validator python3 module!"
exec_no_output apt-get install -y -qq python3-pip \
|| die "Unable to install pip !"
exec_no_output pip3 install -q "email_validator>=1.0.0" \
|| die "Unable to install email_validator !"
fi
H2 "Run mailinabox-ldap setup"
# if EHDD_KEYFILE is set, use encryption-at-rest support
if [ ! -z "$EHDD_KEYFILE" ]; then
ehdd/start-encrypted.sh
@ -249,6 +263,7 @@ miab_ldap_install() {
die "MiaB-LDAP setup failed!"
fi
H2 "Post-setup actions"
workaround_dovecot_sieve_bug
# set actual STORAGE_ROOT, STORAGE_USER, PRIVATE_IP, etc
@ -258,6 +273,8 @@ miab_ldap_install() {
if systemctl is-active --quiet avahi-daemon; then
systemctl restart avahi-daemon
fi
H2 "miab-ldap install success"
}