Set email sender in MS and CM conf (refs #22789).

2.Common_services/1.Postfix/0_setup.py

@@ -40,6 +40,10 @@ def setup(interactive=True):
     if sender_domain:
         if sender_domain == 'ubicast.eu' and utils.get_conf('MS_SERVER_NAME', '') not in ('', 'mediaserver'):
             sender_domain = utils.get_conf('MS_SERVER_NAME')
+        if sender_domain == 'ubicast.eu' and utils.get_conf('CM_SERVER_NAME', '') not in ('', 'campusmanager'):
+            sender_domain = utils.get_conf('CM_SERVER_NAME')
+        if sender_domain == 'ubicast.eu' and utils.get_conf('MONITOR_SERVER_NAME', '') not in ('', 'monitor'):
+            sender_domain = utils.get_conf('MONITOR_SERVER_NAME')
         cmds.extend([
             'rm -f /etc/postfix/generic',
             'echo "root@localhost %s@%s" >> /etc/postfix/generic' % (hostname, sender_domain),

5.MediaServer/1.Install_MediaServer/0_setup.sh

 #!/bin/bash
 source /root/envsetup/global-conf.sh
 
-# Ms package install
+# MS package install
 DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
 
+# set sender address
+sender="${EMAIL_SENDER}"
+if [[ "${sender}" == "" || "${sender}" == "noreply@ubicast.eu" ]]; then
+	if [[ "${MS_SERVER_NAME}" =~ .*\..* ]]; then
+		sender="noreply@${MS_SERVER_NAME}"
+	fi
+fi
+if [[ "${sender}" != "" && "${sender}" != "noreply@ubicast.eu" ]]; then
+	echo "Using ${sender} as sender address for MS."
+	sed -i "s?[# ]*DEFAULT_FROM_EMAIL.*?DEFAULT_FROM_EMAIL = '${sender}'?" /etc/mediaserver/msconf.py
+fi
+
 # MS instance
 msinstaller.py msuser

6.CampusManager/1.Install_CampusManager/0_setup.sh

@@ -7,6 +7,21 @@ if ( apt-cache madison campus-manager | grep "campus-manager | " ); then
 	# configure nginx
 	sed -i "s@server_name skyreach;@server_name ${CM_SERVER_NAME};@" /etc/nginx/sites-available/skyreach.conf
 	service nginx restart
+	# set sender address
+	sender="${EMAIL_SENDER}"
+	if [[ "${sender}" == "" || "${sender}" == "noreply@ubicast.eu" ]]; then
+		if [[ "${CM_SERVER_NAME}" =~ .*\..* ]]; then
+			sender="noreply@${CM_SERVER_NAME}"
+		fi
+	fi
+	if [[ "${sender}" != "" && "${sender}" != "noreply@ubicast.eu" ]]; then
+		echo "Using ${sender} as sender address for CM."
+		if grep "DEFAULT_FROM_EMAIL" /home/skyreach/htdocs/skyreach_site/settings_override.py >/dev/null; then
+			sed -i "s?[# ]*DEFAULT_FROM_EMAIL.*?DEFAULT_FROM_EMAIL = '${sender}'?" /home/skyreach/htdocs/skyreach_site/settings_override.py
+		else
+			echo "DEFAULT_FROM_EMAIL = '${sender}'" >> /home/skyreach/htdocs/skyreach_site/settings_override.py
+		fi
+	fi
 else
 	echo "${YELLOW}The campus-manager package is not available in APT repositories, install skipped.${NC}"
 fi