Skip to content
Snippets Groups Projects
Commit b66dac00 authored by Stéphane Diemer's avatar Stéphane Diemer
Browse files

Fixed log messages in postfix setup

parent 59036730
No related branches found
No related tags found
No related merge requests found
......@@ -36,8 +36,8 @@ def setup(interactive=True):
])
# Configure mail sender
sender = utils.get_conf('EMAIL_SENDER', '').strip(' \t@')
if sender.count('@') != 1:
utils.log('Invalid sender address: "%s" (one "@" must be in the sender address).')
if sender and sender.count('@') != 1:
utils.log('Invalid sender address: "%s" (one "@" must be in the sender address).' % sender)
sender = None
if not sender and hostname:
if utils.get_conf('MS_SERVER_NAME', '') not in ('', 'mediaserver'):
......@@ -46,7 +46,10 @@ def setup(interactive=True):
sender = '%s@%s' % (hostname, utils.get_conf('CM_SERVER_NAME'))
elif utils.get_conf('MONITOR_SERVER_NAME', '') not in ('', 'monitor'):
sender = '%s@%s' % (hostname, utils.get_conf('MONITOR_SERVER_NAME'))
if sender:
if not sender:
utils.warning('No sender address found.')
else:
utils.log('Sender address is "%s".' % sender)
cmds.extend([
'rm -f /etc/postfix/generic',
'echo "root@localhost %s" >> /etc/postfix/generic' % sender,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment