From 99406b730ab44e6a4cf2a4cc0e5260415da85348 Mon Sep 17 00:00:00 2001 From: pvincent Date: Fri, 3 Apr 2026 08:46:18 +0400 Subject: [PATCH] comment listes.txt with # --- all.sh | 31 +++++++++++-------------- listes.txt | 2 +- monit-sympa.sh | 5 +++- sympa/doc/custom_cemea.md | 49 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 67 insertions(+), 20 deletions(-) diff --git a/all.sh b/all.sh index 1e449c6..2a29127 100755 --- a/all.sh +++ b/all.sh @@ -3,28 +3,25 @@ BASEDIR=$(dirname "$0") FILE=${1:-listes.txt} -if ! command -v parallel >/dev/null; then - echo "Please install GNU Parallel: \`sudo apt install parallel\`" +if ! command -v parallel > /dev/null; then + echo 'Please install GNU Parallel: `sudo apt install parallel`' exit 1 fi cd "$BASEDIR" -echo -n "" >.errors +echo -n "" > .errors parallel -a "$FILE" ./monit-sympa.sh -if [[ -f .errors ]]; then - - count=$(cat .errors | wc -l) - if [[ $count -gt 0 ]]; then - echo -e "--------------------" - echo -e " \e[0;31m$count\e[0m errors detected!" - echo -e "--------------------" - cat .errors - exit 1 - else - echo -e "\e[0;32m------------------------\e[0m" - echo -e "everything 's \e[0;32mall right!\e[0m" - echo -e "\e[0;32m------------------------\e[0m" - fi +count=$(cat .errors | wc -l) +if [[ $count -gt 0 ]]; then + echo -e "--------------------" + echo -e " \e[0;31m$count\e[0m errors detected!" + echo -e "--------------------" + cat .errors + exit 1 +else + echo -e "\e[0;32m------------------------\e[0m" + echo -e "everything 's \e[0;32mall right!\e[0m" + echo -e "\e[0;32m------------------------\e[0m" fi diff --git a/listes.txt b/listes.txt index ebf6390..e5ab3ee 100644 --- a/listes.txt +++ b/listes.txt @@ -25,7 +25,7 @@ listes.graine-pdl.org listes.greenpeace.re listes.habsolim.org listes.hauteroya.zourit.net -listes.hub-bretagne.net +#listes.hub-bretagne.net listes.jardinersespassions.re listes.jmmv.fr listes.la-butte.org diff --git a/monit-sympa.sh b/monit-sympa.sh index 82fe575..41ce281 100755 --- a/monit-sympa.sh +++ b/monit-sympa.sh @@ -3,11 +3,14 @@ [ $# -ne 1 ] && echo "domain name required! ie: listes.virkingraid.org" && exit 1 LIST=$1 + +[[ $LIST =~ ^# ]] && exit 0 + TIMEOUT=30 if (curl -m $TIMEOUT -Is "https://$LIST/wws" | grep -q "200 OK"); then echo -e "\e[38;5;240mmonit-sympa\e[0m $LIST \e[38;5;240m... \e[0;32mYES\e[0m" else echo -e "\e[38;5;240mmonit-sympa\e[0m $LIST \e[38;5;240m... \e[0;31mNO\e[0m" - echo "$LIST" >>.errors + echo "$LIST" >> .errors fi diff --git a/sympa/doc/custom_cemea.md b/sympa/doc/custom_cemea.md index a15d077..2bab35d 100644 --- a/sympa/doc/custom_cemea.md +++ b/sympa/doc/custom_cemea.md @@ -18,4 +18,51 @@ then `systemctl restart wwsympa.socket` /usr/share/sympa/default/web_tt2/css.tt2 #line 1661 .top-bar button:hover{ color: white; -} \ No newline at end of file +} + + +PATCH +----- + +https://patch-diff.githubusercontent.com/raw/sympa-community/sympa/pull/1974.patch + +``` +From 60ff8b92718b44d3a638387b703ba9db62b853b8 Mon Sep 17 00:00:00 2001 +From: IKEDA Soji +Date: Sun, 6 Jul 2025 10:22:39 +0900 +Subject: [PATCH] Personalization: Use the content of original originator field + in the template (#1962) + +--- + src/lib/Sympa/Message.pm | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/lib/Sympa/Message.pm b/src/lib/Sympa/Message.pm +index 30b7fbdcd..9fbd963ba 100644 +--- a/src/lib/Sympa/Message.pm ++++ b/src/lib/Sympa/Message.pm +@@ -1536,6 +1536,8 @@ sub _personalize_attrs { + $value =~ s/(?:\r\n|\r|\n)(?=[ \t])//g; # unfold + $data->{headers}{$key} = $value; + } ++ $data->{sender} = $self->{sender}; ++ $data->{gecos} = $self->{gecos}; + $data->{subject} = $self->{decoded_subject}; + + return $data; +``` + + +SIGNATURE +--------- + +Editer les modèles de liste +Edition du fichier attachement de fin de message + +``` +=============================================================== +De la part de : [% IF gecos %][% gecos %] <[% sender %]>[% ELSE %][% sender %][% END %] +Vous êtes abonné·e à la liste "[% listname %]" avec votre courriel : [% user.email %] +Présentation de la liste : [% wwsympa_url %]/info/[% listname %] +Cliquer pour se désabonner : [% wwsympa_url %]/auto_signoff/[% listname %]/[% user.escaped_email %] +``` \ No newline at end of file