From 5d657315fd5707073f2357b840405908f87d735e Mon Sep 17 00:00:00 2001
From: Christoph Kuchenbuch <ckubu@oopen.de>
Date: Fri, 28 Dec 2018 04:03:30 +0100
Subject: [PATCH] fix error: E-mails to address sympa-owner@LIST-DOMAIN.TLD
 should NOT go to sympa transport. Redirect them to POSTMASTER_ABUSE_ADDRESS.
 sympa-owner is the return address for Sympa error messages.

---
 create_sympa_listdomain.sh | 106 +++++++++++++++++++------------------
 install_sympa.sh           |   2 +-
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/create_sympa_listdomain.sh b/create_sympa_listdomain.sh
index 71935e5..5d26710 100755
--- a/create_sympa_listdomain.sh
+++ b/create_sympa_listdomain.sh
@@ -398,7 +398,7 @@ fi
 echo ""
 echo -e "\033[32m--\033[m"
 echo ""
-echo "Insert E-Mail Address(es) to which e-mails to (postmaster|abuse|sympa-request)@$SYMPA_LIST_DOMAIN. "
+echo "Insert E-Mail Address(es) to which e-mails to (postmaster|abuse|sympa-request|sympa-owner)@$SYMPA_LIST_DOMAIN. "
 echo "should be forwarded"
 echo ""
 echo "    - BLANK seperated list of email addresses"
@@ -643,35 +643,37 @@ clear
 echo ""
 echo -e "\033[15G\033[32mSetup new Sympa Domain \033[37m\033[1m$SYMPA_LIST_DOMAIN\033[0;32m using the following Parameters \033[m"
 echo ""
-echo "Sympa Installation Directory...........................: $SYMPA_HOME"
-echo "Sympa main configuration file..........................: $SYMPA_MAIN_CONF_FILE"
-echo "Sympa User.............................................: $SYMPA_USER"
-echo "Sympa Group............................................: $SYMPA_GROUP"
+echo "Sympa Installation Directory.........................: $SYMPA_HOME"
+echo "Sympa main configuration file........................: $SYMPA_MAIN_CONF_FILE"
+echo "Sympa User...........................................: $SYMPA_USER"
+echo "Sympa Group..........................................: $SYMPA_GROUP"
 echo ""
-echo "Sympa List Domain......................................: $SYMPA_LIST_DOMAIN"
-echo "Sympa List Data Directory..............................: $SYMPA_LIST_DATA_DIR"
-echo "Sympa's PID Directory..................................: $SYMPA_PID_DIR"
-echo "Sympa's CGI Directory..................................: $SYMPA_CGI_DIR"
-echo "Sympa's Staic Directory................................: $SYMPA_STATIC_DIR"
-echo "Sympa's Systemd Directory..............................: $SYMPA_SYSTEMD_DIR"
-echo "Listmaster.............................................: $SYMPA_LISTMASTER"
-echo "URL of the Webinterface................................: $SYMPA_WEB_URL"
-echo "Title for the Webinterface.............................: $SYMPA_WEBINTERFACE_TITLE"
+echo "Sympa List Domain....................................: $SYMPA_LIST_DOMAIN"
+echo "Sympa List Data Directory............................: $SYMPA_LIST_DATA_DIR"
+echo "Sympa's PID Directory................................: $SYMPA_PID_DIR"
+echo "Sympa's CGI Directory................................: $SYMPA_CGI_DIR"
+echo "Sympa's Staic Directory..............................: $SYMPA_STATIC_DIR"
+echo "Sympa's Systemd Directory............................: $SYMPA_SYSTEMD_DIR"
+echo "Listmaster...........................................: $SYMPA_LISTMASTER"
+echo "URL of the Webinterface..............................: $SYMPA_WEB_URL"
+echo "Title for the Webinterface...........................: $SYMPA_WEBINTERFACE_TITLE"
 echo ""
 echo "Postfix related:"
-echo "   relay domain file for sympa domains.................: $POSTFIX_RELAY_DOMAIN_FILE"
-echo "   transport file for sympa domains....................: $POSTFIX_TRANSPORT_FILE"
-#echo "   canonical maps (postmaster|abuse|sympa-request)@....: $POSTFIX_CANONICAL_MAPS"
-echo "   virtual maps file (postmaster|abuse|sympa-request)@.: $POSTFIX_VIRTUAL_ALIAS_MAPS"
-echo "   virtual maps forward address(es)....................: $POSTMASTER_ABUSE_ADDRESS"
+echo "   relay domain file for sympa domains...............: $POSTFIX_RELAY_DOMAIN_FILE"
+echo "   transport file for sympa domains..................: $POSTFIX_TRANSPORT_FILE"
+#echo "   canonical maps for addresse"
+#echo "      (postmaster|abuse|sympa-request|sympa-owner)@..: $POSTFIX_CANONICAL_MAPS"
+echo "   virtual maps file "
+echo "      (postmaster|abuse|sympa-request|sympa-owner)@..: $POSTFIX_VIRTUAL_ALIAS_MAPS"
+echo "   virtual maps forward address(es)..................: $POSTMASTER_ABUSE_ADDRESS"
 echo ""
 echo "Apache Webserver related:"
-echo "   IPv4 Address (Sympa Webinterface)...................: $IPv4"
-echo "   IPv6 Address (Sympa Webinterface)...................: $IPv6"
+echo "   IPv4 Address (Sympa Webinterface).................: $IPv4"
+echo "   IPv6 Address (Sympa Webinterface).................: $IPv6"
 echo ""
-echo "   Apache Configuration Directory......................: $apache_conf_dir"
-echo "   Apache VHost Directory..............................: $apache_vhost_dir"
-echo "   Apache Log Directory................................: $apache_log_dir"
+echo "   Apache Configuration Directory....................: $apache_conf_dir"
+echo "   Apache VHost Directory............................: $apache_vhost_dir"
+echo "   Apache Log Directory..............................: $apache_log_dir"
 echo ""
 
 echononl "Start with that configuration? [yes/no]: "
@@ -697,35 +699,37 @@ echo "## -----------" >> $_log_file
 echo "## - Setup new Sympa Domain  \"$SYMPA_LIST_DOMAIN\" using the following Parameters" >> $_log_file
 echo "## -----------" >> $_log_file
 echo "## -" >> $_log_file
-echo "## - Sympa Installation Directory...........................: $SYMPA_HOME" >> $_log_file
-echo "## - Sympa main configuration file..........................: $SYMPA_MAIN_CONF_FILE" >> $_log_file
-echo "## - Sympa User.............................................: $SYMPA_USER" >> $_log_file
-echo "## - Sympa Group............................................: $SYMPA_GROUP" >> $_log_file
+echo "## - Sympa Installation Directory..........................: $SYMPA_HOME" >> $_log_file
+echo "## - Sympa main configuration file.........................: $SYMPA_MAIN_CONF_FILE" >> $_log_file
+echo "## - Sympa User............................................: $SYMPA_USER" >> $_log_file
+echo "## - Sympa Group...........................................: $SYMPA_GROUP" >> $_log_file
 echo "## -" >> $_log_file
-echo "## - Sympa List Domain......................................: $SYMPA_LIST_DOMAIN" >> $_log_file
-echo "## - Sympa List Data Directory..............................: $SYMPA_LIST_DATA_DIR" >> $_log_file
-echo "## - Sympa's PID Directory..................................: $SYMPA_PID_DIR"  >> $_log_file
-echo "## - Sympa's CGI Directory..................................: $SYMPA_CGI_DIR"  >> $_log_file
-echo "## - Sympa's Staic Directory..,.............................: $SYMPA_STATIC_DIR" >> $_log_file
-echo "## - Sympa's Systemd Directory..............................: $SYMPA_SYSTEMD_DIR" >> $_log_file
-echo "## - Listmaster.............................................: $SYMPA_LISTMASTER" >> $_log_file
-echo "## - URL of the Webinterface................................: $SYMPA_WEB_URL" >> $_log_file
-echo "## - Title for the Webinterface.............................: $SYMPA_WEBINTERFACE_TITLE" >> $_log_file
+echo "## - Sympa List Domain.....................................: $SYMPA_LIST_DOMAIN" >> $_log_file
+echo "## - Sympa List Data Directory.............................: $SYMPA_LIST_DATA_DIR" >> $_log_file
+echo "## - Sympa's PID Directory.................................: $SYMPA_PID_DIR"  >> $_log_file
+echo "## - Sympa's CGI Directory.................................: $SYMPA_CGI_DIR"  >> $_log_file
+echo "## - Sympa's Staic Directory...............................: $SYMPA_STATIC_DIR" >> $_log_file
+echo "## - Sympa's Systemd Directory.............................: $SYMPA_SYSTEMD_DIR" >> $_log_file
+echo "## - Listmaster............................................: $SYMPA_LISTMASTER" >> $_log_file
+echo "## - URL of the Webinterface...............................: $SYMPA_WEB_URL" >> $_log_file
+echo "## - Title for the Webinterface............................: $SYMPA_WEBINTERFACE_TITLE" >> $_log_file
 echo "## -"  >> $_log_file
 echo "## - Postfix related:" >> $_log_file
-echo "## -    relay domain file for sympa domains.................: $POSTFIX_RELAY_DOMAIN_FILE" >> $_log_file
-echo "## -    transport file for sympa domains....................: $POSTFIX_TRANSPORT_FILE" >> $_log_file
-#echo "## -    canonical maps (postmaster|abuse|sympa-request)@....: $POSTFIX_CANONICAL_MAPS" >> $_log_file
-echo "## -    virtual maps file (postmaster|abuse|sympa-request)@.: $POSTFIX_VIRTUAL_ALIAS_MAPS" >> $_log_file
-echo "## -    virtual maps forward address(es)....................: $POSTMASTER_ABUSE_ADDRESS" >> $_log_file
+echo "## -    relay domain file for sympa domains................: $POSTFIX_RELAY_DOMAIN_FILE" >> $_log_file
+echo "## -    transport file for sympa domains...................: $POSTFIX_TRANSPORT_FILE" >> $_log_file
+#echo "## -    canonical maps for addresse"
+#echo "## -       (postmaster|abuse|sympa-request|sympa-owner)@...: $POSTFIX_CANONICAL_MAPS" >> $_log_file
+echo "## -    virtual maps file for adresses postmaster@"
+echo "## -       (postmaster|abuse|sympa-request|sympa-owner:)@..: $POSTFIX_VIRTUAL_ALIAS_MAPS" >> $_log_file
+echo "## -    virtual maps forward address(es)...................: $POSTMASTER_ABUSE_ADDRESS" >> $_log_file
 echo "## -" >> $_log_file
 echo "## - Apache Webserver related:" >> $_log_file
-echo "## -    IPv4 Address (Sympa Webinterface)...................: $IPv4" >> $_log_file
-echo "## -    IPv6 Address (Sympa Webinterface)...................: $IPv6" >> $_log_file
+echo "## -    IPv4 Address (Sympa Webinterface)..................: $IPv4" >> $_log_file
+echo "## -    IPv6 Address (Sympa Webinterface)..................: $IPv6" >> $_log_file
 echo "## -" >> $_log_file
-echo "## -    Apache Configuration Directory......................: $apache_conf_dir" >> $_log_file
-echo "## -    Apache VHost Directory..............................: $apache_vhost_dir" >> $_log_file
-echo "## -    Apache Log Directory................................: $apache_log_dir" >> $_log_file
+echo "## -    Apache Configuration Directory.....................: $apache_conf_dir" >> $_log_file
+echo "## -    Apache VHost Directory.............................: $apache_vhost_dir" >> $_log_file
+echo "## -    Apache Log Directory...............................: $apache_log_dir" >> $_log_file
 echo "## -" >> $_log_file
 echo "" >> $_log_file
 
@@ -1053,12 +1057,12 @@ else
    echo "## -" >> $_log_file
    echo "cat <<EOF >> $POSTFIX_VIRTUAL_ALIAS_MAPS
 
-/^(postmaster|abuse|sympa-request)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS 
+/^(postmaster|abuse|sympa-request|sympa-owner)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS 
 EOF" >> $_log_file
 
    cat <<EOF >> $POSTFIX_VIRTUAL_ALIAS_MAPS
 
-/^(postmaster|abuse|sympa-request)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS
+/^(postmaster|abuse|sympa-request|sympa-owner)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS
 EOF
    if [ "$?" = "0" ]; then
       echo_ok
@@ -1080,12 +1084,12 @@ fi
 #   echo "## -" >> $_log_file
 #   echo "cat <<EOF >> $POSTFIX_CANONICAL_MAPS
 #
-#/^(postmaster|abuse|sympa-request)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS
+#/^(postmaster|abuse|sympa-request|sympa-owner)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS
 #EOF" >> $_log_file
 #
 #   cat <<EOF >> $POSTFIX_CANONICAL_MAPS
 #
-#/^(postmaster|abuse|sympa-request)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS
+#/^(postmaster|abuse|sympa-request|sympa-owner)\@${SYMPA_LIST_DOMAIN_ESCAPED}\$/   $POSTMASTER_ABUSE_ADDRESS
 #EOF
 #   if [ "$?" = "0" ]; then
 #      echo_ok
diff --git a/install_sympa.sh b/install_sympa.sh
index b17c684..5ea5844 100755
--- a/install_sympa.sh
+++ b/install_sympa.sh
@@ -3960,7 +3960,7 @@ EOF
 
       echo ""
 
-      ## - Forward addresses (postmaster|abuse|sympa-request)@sympa-domain.tld) using virtual_alias_maps
+      ## - Forward addresses (postmaster|abuse|sympa-request|sympa-owner)@sympa-domain.tld) using virtual_alias_maps
       ## -
       _file_name=sympa_virtual_aliases
       _parameter_name=virtual_alias_maps