external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-09 16:37:23 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into mgmt-auth

Browse Source 
Conflicts:
	management/daemon.py
This commit is contained in:
Michael Kropat
2014-06-21 21:29:25 -04:00
parent bb394242ef 064d75e261
commit 554a28479f
9 changed files with 97 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/daemon.py
View File

@@ -109,6 +109,9 @@ def do_updates():
if __name__ == '__main__':
if "DEBUG" in os.environ: app.debug = True
if not app.debug:
app.logger.addHandler(utils.create_syslog_handler())
# For testing on the command line, you can use `curl` like so:
# curl --user $(</var/lib/mailinabox/api.key): http://localhost:10222/mail/users
auth_service.write_key()
@@ -117,6 +120,5 @@ if __name__ == '__main__':
# debug console and enter that as the username
app.logger.info('API key: ' + auth_service.key)
app.run(port=10222)