mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2026-03-04 15:54:48 +01:00
Display and allow chaninging a comment/description for aliases. Change the default comment for required aliases to "Required alias".
This commit is contained in:
@@ -43,7 +43,8 @@ installed_state_capture() {
|
||||
echo "Unable to get aliases: rc=$? err=$REST_ERROR" 1>&2
|
||||
return 2
|
||||
fi
|
||||
echo "$REST_OUTPUT" > "$state_dir/aliases.json"
|
||||
# ignore/exclude the alias description field
|
||||
echo "$REST_OUTPUT" | grep -v '"description":' > "$state_dir/aliases.json"
|
||||
|
||||
# record dns config
|
||||
H2 "record dns details"
|
||||
@@ -84,7 +85,7 @@ installed_state_compare() {
|
||||
H2 "Aliases"
|
||||
output="$(diff "$s1/aliases.json" "$s2/aliases.json" 2>&1)"
|
||||
if [ $? -ne 0 ]; then
|
||||
change="true"
|
||||
changed="true"
|
||||
echo "ALIASES ARE DIFFERENT!"
|
||||
echo "$output"
|
||||
else
|
||||
|
||||
@@ -40,6 +40,7 @@ suite_start() {
|
||||
let SUITE_COUNT_SKIPPED=0
|
||||
let SUITE_COUNT_TOTAL=0
|
||||
SUITE_NAME="$1"
|
||||
SUITE_START=$(date +%s)
|
||||
OUTDIR="$BASE_OUTPUTDIR/$SUITE_NAME"
|
||||
mkdir -p "$OUTDIR"
|
||||
echo ""
|
||||
@@ -50,7 +51,8 @@ suite_start() {
|
||||
|
||||
suite_end() {
|
||||
suite_cleanup "$@"
|
||||
echo "Suite $SUITE_NAME finished"
|
||||
local SUITE_END=$(date +%s)
|
||||
echo "Suite $SUITE_NAME finished ($(elapsed_pretty $SUITE_START $SUITE_END))"
|
||||
let OVERALL_SUCCESSES+=$SUITE_COUNT_SUCCESS
|
||||
let OVERALL_FAILURES+=$SUITE_COUNT_FAILURE
|
||||
let OVERALL_SKIPPED+=$SUITE_COUNT_SKIPPED
|
||||
|
||||
Reference in New Issue
Block a user