From e4fe557332e9d011633c600c726355435c8eab73 Mon Sep 17 00:00:00 2001
From: Christoph Kuchenbuch <ckubu@oopen.de>
Date: Fri, 22 Jan 2021 12:32:31 +0100
Subject: [PATCH] create_sympa_listdomain.sh: restart also 'wwsympa'-service
 after listdomain creation.

---
 create_sympa_listdomain.sh | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/create_sympa_listdomain.sh b/create_sympa_listdomain.sh
index 5d26710..5984532 100755
--- a/create_sympa_listdomain.sh
+++ b/create_sympa_listdomain.sh
@@ -391,18 +391,25 @@ else
 fi
 
 if grep -e "^\s*listmaster" $SYMPA_MAIN_CONF_FILE > /dev/null 2>&1 ; then
-   _POSTMASTER_ABUSE_ADDRESS=`grep -e "^\s*listmaster" $SYMPA_MAIN_CONF_FILE 2> /dev/null | awk '{print$2}'`
+   _BSP_POSTMASTER_ABUSE_ADDRESS=`grep -e "^\s*listmaster" $SYMPA_MAIN_CONF_FILE 2> /dev/null | awk '{print$2}'`
 elif grep -e "^\s*#\s*listmaster" $SYMPA_MAIN_CONF_FILE > /dev/null 2>&1 ; then
-   _POSTMASTER_ABUSE_ADDRESS=`grep -e "^\s*#\s*listmaster" $SYMPA_MAIN_CONF_FILE 2> /dev/null | awk '{print$2}'`
+   _BSP_POSTMASTER_ABUSE_ADDRESS=`grep -e "^\s*#\s*listmaster" $SYMPA_MAIN_CONF_FILE 2> /dev/null | awk '{print$2}'`
 fi
+_POSTMASTER_ABUSE_ADDRESS="postmaster@$(echo $SYMPA_LIST_DOMAIN | grep -o '[^.]*\.[^.]*$')"
 echo ""
 echo -e "\033[32m--\033[m"
 echo ""
 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 ""
+echo "Example"
+echo "   forward adress(es) [${_POSTMASTER_ABUSE_ADDRESS}]: $_BSP_POSTMASTER_ABUSE_ADDRESS"
+echo ""
 echo "    - BLANK seperated list of email addresses"
 echo ""
+echo "Type return to accept the default '${_POSTMASTER_ABUSE_ADDRESS}'"
+echo ""
 POSTMASTER_ABUSE_ADDRESS=
 if [ -n "$_POSTMASTER_ABUSE_ADDRESS" ]; then
    echononl "forward adress(es) [${_POSTMASTER_ABUSE_ADDRESS}]: "
@@ -1399,7 +1406,7 @@ fi
 echo ""
 echononl "\tRestart Sympa Mailing List Manager.."
 echo "" >> $_log_file
-echo "## - Check Apache Configuration" >> $_log_file
+echo "## - Restart Sympa Mailing List Manager" >> $_log_file
 echo "## -" >> $_log_file
 if $SYSTEMD_EXISTS ; then
    echo "systemctl restart sympa" >> $_log_file
@@ -1421,6 +1428,31 @@ else
    fi
 fi
 
+echo ""
+echononl "\tRestart Sympa's Webservice 'wwsympa'.."
+echo "" >> $_log_file
+echo "## - Restart Sympa's Webservice 'wwsympa'" >> $_log_file
+echo "## -" >> $_log_file
+if $SYSTEMD_EXISTS ; then
+   echo "systemctl restart wwsympa" >> $_log_file
+   systemctl restart wwsympa >> $_log_file 2>&1
+   if [ "$?" = "0" ]; then
+      echo_ok
+      _apache_configtest=true
+   else
+      echo_failed
+   fi
+else
+   echo "/etc/init.d/wwsympa restart" >> $_log_file
+   /etc/init.d/wwsympa restart  >> $_log_file 2>&1
+   if [ "$?" = "0" ]; then
+      echo_ok
+      _apache_configtest=true
+   else
+      echo_failed
+   fi
+fi
+
 
 
 echo ""