Skip to content

Commit f02f34b

Browse files
committed
from email. need to make it inherit old jsons soon... oops, I've gone and built a configuration system.
1 parent a5f2ac9 commit f02f34b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

configure

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if __name__ == '__main__' :
1414
parser.add_option('-f', action='store_true', dest='force', default=False, help='needed if not the first run of configure that succeeds; force overwrite of configuration.')
1515
parser.add_option('--mx', dest='mx', help="sent email via mail exchange.")
1616
parser.add_option('--admin-email', dest='admin_email', help="email address to send system status messages to.")
17-
17+
parser.add_option('--from-email', dest='from_email', help="send email from this address.")
1818
opts, args = parser.parse_args()
1919

2020
if not opts.virtualenv :
@@ -27,6 +27,7 @@ if __name__ == '__main__' :
2727
'code_dir' : opts.code_dir,
2828
'mx' : opts.mx,
2929
'admin_email' : opts.admin_email,
30+
'from_email' : opts.from_email,
3031
}
3132

3233
def printout(d) :
@@ -44,6 +45,7 @@ if __name__ == '__main__' :
4445
assert os.path.exists(out_opts['code_dir'])
4546
assert out_opts['mx']
4647
assert out_opts['admin_email']
48+
assert out_opts['from_email']
4749

4850
print 'writing config:'
4951
printout(out_opts)

gaggled.conf.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gaggled {
88

99
smtpgate {
1010
mx {{mx}}
11-
from makernetwork@localhost
11+
from {{from_email}}
1212
to {{admin_email}}
1313
helo localhost
1414
}

0 commit comments

Comments
 (0)