mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2026-03-05 15:57:23 +01:00
Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
Upstream is adding handling for utf8 domains by creating a domain alias @utf8 -> @idna. I'm deviating from this approach by setting multiple email address (idna and utf8) per user and alias where a domain contains non-ascii characters. The maildrop (mailbox) remains the same - all mail goes to the user's mailbox regardless of which email address was used. This is more in line with how other systems (eg. active directory), handle multiple email addresses for a single user. # Conflicts: # README.md # management/mailconfig.py # management/templates/index.html # setup/dns.sh # setup/mail-users.sh
This commit is contained in:
downtownallday
@@ -13,6 +13,7 @@ installed_state_capture() {
|
||||
# TOOD: tls certificates: expected CN's
|
||||
|
||||
local state_dir="$1"
|
||||
local install_dir="${2:-.}"
|
||||
local info="$state_dir/info.txt"
|
||||
|
||||
H1 "Capture installed state to $state_dir"
|
||||
@@ -22,11 +23,18 @@ installed_state_capture() {
|
||||
mkdir -p "$state_dir"
|
||||
|
||||
# create info.json
|
||||
if ! pushd "$install_dir" >/dev/null; then
|
||||
echo "Directory '$install_dir' no accessible"
|
||||
return 1
|
||||
fi
|
||||
H2 "create info.txt"
|
||||
echo "STATE_VERSION=1" > "$info"
|
||||
echo "GIT_VERSION='$(git describe --abbrev=0)'" >>"$info"
|
||||
echo "GIT_VERSION='$(git describe)'" >>"$info"
|
||||
git describe | awk -F- '{ split($1,a,"."); print "MAJOR="substr(a[1],2); print "MINOR="a[2]; print "RELEASE="$2 }' >>"$info"
|
||||
echo "GIT_ORIGIN='$(git remote -v | grep ^origin | grep 'fetch)$' | awk '{print $2}')'" >>"$info"
|
||||
echo "MIGRATION_VERSION=$(cat "$STORAGE_ROOT/mailinabox.version")" >>"$info"
|
||||
echo "MIGRATION_VERSION=$([ -e "$STORAGE_ROOT/mailinabox.version" ] && cat "$STORAGE_ROOT/mailinabox.version")" >>"$info"
|
||||
echo "MIGRATION_ML_VERSION=$([ -e "$STORAGE_ROOT/mailinabox-ldap.version" ] && cat "$STORAGE_ROOT/mailinabox-ldap.version")" >>"$info"
|
||||
popd >/dev/null
|
||||
|
||||
# record users
|
||||
H2 "record users"
|
||||
@@ -75,17 +83,21 @@ installed_state_compare() {
|
||||
#
|
||||
# determine compare type id (incorporating repo, branch, version, etc)
|
||||
#
|
||||
local compare_type="all"
|
||||
source "$s1/info.txt"
|
||||
MAJOR_A="$MAJOR"
|
||||
MINOR_A="$MINOR"
|
||||
RELEASE_A="${RELEASE:-0}"
|
||||
PROD_A="miab"
|
||||
grep "mailinabox-ldap" <<<"$GIT_ORIGIN" >/dev/null && PROD_A="miabldap"
|
||||
|
||||
source "$s2/info.txt"
|
||||
if grep "mailinabox-ldap" <<<"$GIT_ORIGIN" >/dev/null; then
|
||||
GIT_ORIGIN=""
|
||||
source "$s1/info.txt"
|
||||
if ! grep "mailinabox-ldap.git" <<<"$GIT_ORIGIN" >/dev/null; then
|
||||
compare_type="miab2miab-ldap"
|
||||
fi
|
||||
fi
|
||||
echo "Compare type: $compare_type"
|
||||
MAJOR_B="$MAJOR"
|
||||
MINOR_B="$MINOR"
|
||||
RELEASE_B="${RELEASE:-0}"
|
||||
PROD_B="miab"
|
||||
grep "mailinabox-ldap" <<<"$GIT_ORIGIN" >/dev/null && PROD_B="miabldap"
|
||||
|
||||
cmptype="${PROD_A}2${PROD_B}"
|
||||
|
||||
#
|
||||
# filter data for compare type
|
||||
@@ -95,7 +107,7 @@ installed_state_compare() {
|
||||
cp "$s2/users.json" "$s2/users-cmp.json" || changed="true"
|
||||
cp "$s2/aliases.json" "$s2/aliases-cmp.json" || changed="true"
|
||||
|
||||
if [ "$compare_type" == "miab2miab-ldap" ]
|
||||
if [ "$cmptype" = "miab2miabldap" ]
|
||||
then
|
||||
# user display names is a feature added to MiaB-LDAP that is
|
||||
# not in MiaB
|
||||
@@ -104,7 +116,19 @@ installed_state_compare() {
|
||||
# alias descriptions is a feature added to MiaB-LDAP that is
|
||||
# not in MiaB
|
||||
grep -v '"description":' "$s2/aliases.json" > "$s2/aliases-cmp.json" || changed="true"
|
||||
fi
|
||||
fi
|
||||
|
||||
# cmp: v0.54 to current
|
||||
if [ "$cmptype" = "miabldap2miabldap" -a $MAJOR_A -eq 0 -a $MINOR_A -le 54 -a $RELEASE_A -eq 0 ]
|
||||
then
|
||||
# s1: convert aliases 'required' to 'auto' and resort
|
||||
jq -c ".[] | .aliases | sort_by(.address) | .[] | {address:.address, forwards_to:.forwards_to, permitted_senders:.permitted_senders, auto:.required, description:.description}" "$s1/aliases.json" > "$s1/aliases-cmp.json"
|
||||
sed -i 's/\("address":"administrator@.*"auto":\)true/\1false/' "$s1/aliases-cmp.json"
|
||||
|
||||
# s2: re-sort aliases
|
||||
jq -c ".[] | .aliases | sort_by(.address) | .[] | {address:.address, forwards_to:.forwards_to, permitted_senders:.permitted_senders, auto:.auto, description:.description}" "$s2/aliases.json" > "$s2/aliases-cmp.json"
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# users
|
||||
@@ -122,6 +146,7 @@ installed_state_compare() {
|
||||
#
|
||||
# aliases
|
||||
#
|
||||
|
||||
H2 "Aliases"
|
||||
output="$(diff "$s1/aliases-cmp.json" "$s2/aliases-cmp.json" 2>&1)"
|
||||
if [ $? -ne 0 ]; then
|
||||
@@ -154,36 +179,36 @@ installed_state_compare() {
|
||||
done
|
||||
echo "$count added"
|
||||
|
||||
H2 "DNS - zones changed"
|
||||
count=0
|
||||
for zone in $(cd "$s1/zones"; ls *.signed); do
|
||||
if [ -e "$s2/zones/$zone" ]; then
|
||||
# all the signatures change if we're using self-signed certs
|
||||
# ignore ttl changes
|
||||
local t1="/tmp/s1.$$.txt"
|
||||
local t2="/tmp/s2.$$.txt"
|
||||
awk '\
|
||||
$4 == "RRSIG" || $4 == "NSEC3" { next; } \
|
||||
$4 == "SOA" { print $1" "$3" "$4" "$5" "$6" "$8" "$10" "$12; next } \
|
||||
{ for(i=1;i<=NF;i++) if (i!=2) printf("%s ",$i); print ""; }' \
|
||||
"$s1/zones/$zone" > "$t1"
|
||||
# H2 "DNS - zones changed"
|
||||
# count=0
|
||||
# for zone in $(cd "$s1/zones"; ls *.signed); do
|
||||
# if [ -e "$s2/zones/$zone" ]; then
|
||||
# # all the signatures change if we're using self-signed certs
|
||||
# # ignore ttl changes
|
||||
# local t1="/tmp/s1.$$.txt"
|
||||
# local t2="/tmp/s2.$$.txt"
|
||||
# awk '\
|
||||
# $4 == "RRSIG" || $4 == "NSEC3" { next; } \
|
||||
# $4 == "SOA" { print $1" "$3" "$4" "$5" "$6" "$8" "$10" "$12; next } \
|
||||
# { for(i=1;i<=NF;i++) if (i!=2) printf("%s ",$i); print ""; }' \
|
||||
# "$s1/zones/$zone" > "$t1"
|
||||
|
||||
awk '\
|
||||
$4 == "RRSIG" || $4 == "NSEC3" { next; } \
|
||||
$4 == "SOA" { print $1" "$3" "$4" "$5" "$6" "$8" "$10" "$12; next } \
|
||||
{ for(i=1;i<=NF;i++) if (i!=2) printf("%s ",$i); print ""; }' \
|
||||
"$s2/zones/$zone" > "$t2"
|
||||
# awk '\
|
||||
# $4 == "RRSIG" || $4 == "NSEC3" { next; } \
|
||||
# $4 == "SOA" { print $1" "$3" "$4" "$5" "$6" "$8" "$10" "$12; next } \
|
||||
# { for(i=1;i<=NF;i++) if (i!=2) printf("%s ",$i); print ""; }' \
|
||||
# "$s2/zones/$zone" > "$t2"
|
||||
|
||||
output="$(diff "$t1" "$t2" 2>&1)"
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "CHANGED zone: $zone"
|
||||
echo "$output"
|
||||
changed="true"
|
||||
let count+=1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
echo "$count zone files had differences"
|
||||
# output="$(diff "$t1" "$t2" 2>&1)"
|
||||
# if [ $? -ne 0 ]; then
|
||||
# echo "CHANGED zone: $zone"
|
||||
# echo "$output"
|
||||
# changed="true"
|
||||
# let count+=1
|
||||
# fi
|
||||
# fi
|
||||
# done
|
||||
# echo "$count zone files had differences"
|
||||
|
||||
if $changed; then
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user