From 8692ce7618b7fa05cd460de0d5c6751e54da1211 Mon Sep 17 00:00:00 2001
From: Patrick Cernko <pcernko@mpi-klsb.mpg.de>
Date: Fri, 12 Jan 2024 16:19:52 +0100
Subject: [PATCH] fix: renamed blacklist to blocklist support for gen_config's
info file
---
mm2sympa.sh | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/mm2sympa.sh b/mm2sympa.sh
index ef8f550..5d27a5a 100755
--- a/mm2sympa.sh
+++ b/mm2sympa.sh
@@ -51,16 +51,28 @@ sshml config_list -o /dev/stdout $mmlistname > $inputpy
sed -i -e "s/ '/ u'/" -e 's/ "/ u"/' $inputpy
# enhance config with additional variables for gen_config.py
cat <<EOF >> $inputpy
+old_listname = u'$mmlistname'
new_listname = u'$sympalistname'
robot = u'$robot'
url = u'$wwsympa_url'
EOF
configxml=$tmpdir/input.xml
-blacklist=$tmpdir/blacklist.txt
+infofile=$tmpdir/info
+blocklist=$tmpdir/blocklist.txt
whitelist=$tmpdir/whitelist.txt
-$base/gen_config.py $inputpy $configxml $blacklist $whitelist
+$base/gen_config.py $inputpy $configxml $infofile $blocklist $whitelist
# sympa user needs access
chmod 0644 $configxml
+
+# fetch members
+dumpfile=$tmpdir/member.dump
+$base/mailman-subscribers3.py \
+ --url_path /admin \
+ --ssl \
+ --sympa \
+ $mmdomain $mmlistname "$MMPW" \
+ > $dumpfile
+
sympa --create_list --robot $robot --input_file $configxml
# import archive
@@ -72,22 +84,13 @@ else
echo "no archive, thus no archive import needed"
fi
-# import members
-dumpfile=/var/lib/sympa/list_data/$robot/$sympalistname/member.dump
-$base/mailman-subscribers3.py \
- --url_path /admin \
- --ssl \
- --sympa \
- $mmdomain $mmlistname "$MMPW" \
- > $dumpfile
-# sympa user needs access
-chown sympa:sympa $dumpfile
-chmod 0640 $dumpfile
+listdir=/var/lib/sympa/list_data/$robot/$sympalistname
+install -m 640 -o sympa -g sympa $dumpfile $listdir
sympa --restore_users --list=$sympalistname@$robot
-search_filters=/var/lib/sympa/list_data/$robot/$sympalistname/search_filters
+search_filters=$listdir/search_filters
install -d -m 750 -o sympa -g sympa $search_filters
-for f in $blacklist $whitelist; do
+for f in $blocklist $whitelist; do
[ -s $f ] || continue
install -m 640 -o sympa -g sympa $f $search_filters
done
--
GitLab