diff --git a/mm2sympa.sh b/mm2sympa.sh index 511503136bc3292b9ea86711a79c27c987dc4370..902ca9047180de80aea3920ac759c8e61f585dea 100755 --- a/mm2sympa.sh +++ b/mm2sympa.sh @@ -35,8 +35,6 @@ function sshml() { wwsympa_url=$(awk '$1=="wwsympa_url" { print $2; }' /etc/sympa/$robot/robot.conf) -echo importing $mailmanlist as $sympalistname@$robot - tmpdir=$(mktemp -t -d mm2sympa.${mailmanlist/@/AT}.XXXXXXXX) # sympa user needs access chmod go+rx $tmpdir @@ -78,12 +76,12 @@ $base/gen_config.py $inputpy $membersjson $configxml $infofile $blocklist $white chmod 0644 $configxml # now generate list based on config XML -sympa --create_list --robot $robot --input_file $configxml +sympa --create_list --robot $robot --input_file $configxml 2> >(grep -vxF 'create_list [notice] Aliases have been installed. ()') # load users from member.dump listdir=/var/lib/sympa/list_data/$robot/$sympalistname install -m 640 -o sympa -g sympa $memberdump $listdir -sympa --restore_users --list=$sympalistname@$robot +sympa --restore_users --list=$sympalistname@$robot 2> >(grep -vxF "$sympalistname@$robot: Restored list users (member)") # install blocklist, whitelist and modlist search_filters=$listdir/search_filters @@ -95,11 +93,8 @@ done # import archive localarchive=$tmpdir/archive.mbox -if sshml cat $mmarchive > $localarchive; then +if sshml test -r $mmarchive; then + sshml cat $mmarchive > $localarchive chmod 644 $localarchive $base/import_mbox.sh $localarchive $sympalistname $robot > $tmpdir/archive.log -else - echo "no archive, thus no archive import needed" fi - -echo sshml rmlist -a $mmlistname