rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

appy.bin: backup.py: added the possibility to define login and password for SMTP authentication (the script allows to send mail); appy.pod: added the possibility to specify size of images to import (see https://answers.launchpad.net/appy/+question/171846).

Browse source
This commit is contained in:
Gaetan Delannay 2011-09-24 12:53:33 +02:00
parent 96a592f125
commit eceb9175fd
4 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bin/backup.py
View file

@ -138,8 +138,17 @@ class ZodbBackuper:
subject, self.logMem.getvalue())
try:
w('> Sending mail notifications to %s...' % self.emails)
server, port = self.options.smtpServer.split(':')
smtpInfo = self.options.smtpServer.split(':', 3)
login = password = None
if len(smtpInfo) == 2:
# We simply have server and port
server, port = smtpInfo
else:
# We also have login and password
server, port, login, password = smtpInfo
smtpServer = smtplib.SMTP(server, port=int(port))
if login:
smtpServer.login(login, password)
res = smtpServer.sendmail(self.options.fromAddress,
self.emails.split(','), msg)
if res:
@ -292,8 +301,12 @@ class ZodbBackupScript:
default='', metavar="FROMADDRESS", type='string')
optParser.add_option("-s", "--smtp-server", dest="smtpServer",
help="SMTP server and port (ie: localhost:25) " \
"for sending mails", default='localhost:25',
metavar="SMTPSERVER", type='string')
"for sending mails. You can also embed " \
"username and password if the SMTP server " \
"requires authentication, ie " \
"localhost:25:myLogin:myPassword",
default='localhost:25', metavar="SMTPSERVER",
type='string')
optParser.add_option("-t", "--tempFolder", dest="tempFolder",
help="Folder used by OO for producing temp " \
"files. Defaults to /tmp.",