You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2016/12/17 19:25:26 UTC
[2/5] incubator-ponymail git commit: allow preferences to use
non-default mail port
allow preferences to use non-default mail port
This fixes #303
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/ae7669f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/ae7669f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/ae7669f8
Branch: refs/heads/master
Commit: ae7669f8ed5c2689617db27e9399e507344f2cbd
Parents: 6c9398b
Author: Sebb <se...@apache.org>
Authored: Sat Dec 17 17:28:25 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Sat Dec 17 17:28:25 2016 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
site/api/preferences.lua | 3 ++-
tools/setup.py | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/ae7669f8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ff6249..46ca9c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@
- ponymail.js uses unsupported preferences.lua parameter (#165)
- preferences.lua never fetches descriptions (#163)
- API.md does not document all the stats.lua parameters (#115)
+- allow preferences to use non-default mail port (#303)
## CHANGES in 0.9b:
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/ae7669f8/site/api/preferences.lua
----------------------------------------------------------------------
diff --git a/site/api/preferences.lua b/site/api/preferences.lua
index f585833..0f95fbb 100644
--- a/site/api/preferences.lua
+++ b/site/api/preferences.lua
@@ -112,7 +112,8 @@ Pony Mail - Email for Ponies and People.
from = ("\"Pony Mail\"<no-reply@%s>"):format(r.hostname),
rcpt = get.associate,
source = source,
- server = config.mailserver
+ server = config.mailserver,
+ port = config.mailport or nil -- if not specified, use the default
}
r:puts(JSON.encode{requested = rv or er})
return cross.OK
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/ae7669f8/tools/setup.py
----------------------------------------------------------------------
diff --git a/tools/setup.py b/tools/setup.py
index efb74b1..aa34c2b 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -465,6 +465,7 @@ with open(os.path.join(config_path,config_file), "w") as f:
local config = {
es_url = "http://%s:%u/%s/",
mailserver = "%s",
+-- mailport = 1025, -- override the default port (25)
accepted_domains = "%s",
wordcloud = %s,
slow_count = false,