[incubator-ponymail-foal] branch master updated: Fix configuration generation template strings

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
     new dd75eb7  Fix configuration generation template strings
     new 7931995  Merge pull request #18 from sbp/fix-dburl-hostname
dd75eb7 is described below

commit dd75eb732db64167c222c0fffed602a9945f5fa8
Author: Sean B. Palmer <se...@miscoranda.com>
AuthorDate: Thu May 6 10:38:44 2021 +0100

    Fix configuration generation template strings
---
 tools/setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/setup.py b/tools/setup.py
index 9ecd6ad..20e5f72 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -391,7 +391,7 @@ debug:
     #cropout:               string to crop from list-id
 
             """
-        % (hostname, dbname, port, genname, nonce or "~")
+        % (dburl, dbname, genname, nonce or "~")
     )
 
 print("Copying sample JS config to config.js (if needed)...")
@@ -440,7 +440,7 @@ oauth:
   github_client_id:     ~
   github_client_secret: ~
 
-""" % (hostname,  port, dbname, "true" if wce else "false", mlserver, mldom))
+""" % (dburl, dbname, "true" if wce else "false", mlserver, mldom))
 
 
 print("All done, Pony Mail should...work now :)")