[incubator-ponymail-foal] branch master updated (e0b1c86 -> 411b7ee)

[hu...@apache.org]

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

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


    from e0b1c86  Create database id has once to ensure consistency
     new e889192  Set defaults to what we suggest in setup process
     new 411b7ee  Don't input unless we need the vars (if --defaults for instance is active)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tools/setup.py | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

[incubator-ponymail-foal] 01/02: Set defaults to what we suggest in setup process

[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

commit e889192110e4ca3ac2ea003e265deac09636965b
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Sep 4 07:40:58 2020 +0200

    Set defaults to what we suggest in setup process
---
 tools/setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/setup.py b/tools/setup.py
index 61618ae..3385b93 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -189,9 +189,9 @@ if args.defaults:
     mldom = "example.org"
     wc = "Y"
     wce = True
-    shards = 1
-    replicas = 0
-    genname = "cluster"
+    shards = 3
+    replicas = 1
+    genname = "dkim"
     urlPrefix = ""
     nonce = None
 

[incubator-ponymail-foal] 02/02: Don't input unless we need the vars (if --defaults for instance is active)

[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

commit 411b7ee677642d4078b2e2688501b7382a3f67a7
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Sep 4 07:45:52 2020 +0200

    Don't input unless we need the vars (if --defaults for instance is active)
    
    This fixes #6.
---
 tools/setup.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tools/setup.py b/tools/setup.py
index 3385b93..2a03518 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -229,11 +229,13 @@ if args.generator:
 if args.generator == "dkim" and args.nonce is not None:
     nonce = args.nonce
 
-hostname = input("What is the hostname of the ElasticSearch server? [localhost]: ")
 if not hostname:
-    hostname = "localhost"
+    hostname = input("What is the hostname of the ElasticSearch server? [localhost]: ")
+    if not hostname:
+        hostname = "localhost"
 
-urlPrefix = input("Database URL prefix if any (hit enter if none): ")
+if urlPrefix is None:
+    urlPrefix = input("Database URL prefix if any (hit enter if none): ")
 
 while port < 1 or port > 65536:
     try:
@@ -244,19 +246,22 @@ while port < 1 or port > 65536:
     except ValueError:
         pass
 
-dbname = input("What would you like to call the mail index [ponymail]: ")
 if not dbname:
-    dbname = "ponymail"
+    dbname = input("What would you like to call the mail index [ponymail]: ")
+    if not dbname:
+        dbname = "ponymail"
 
-mlserver = input(
-    "What is the hostname of the outgoing mailserver hostname? [localhost]: "
-)
 if not mlserver:
-    mlserver = "localhost"
+    mlserver = input(
+        "What is the hostname of the outgoing mailserver hostname? [localhost]: "
+    )
+    if not mlserver:
+        mlserver = "localhost"
 
-mldom = input("Which domains would you accept mail to from web-replies? [*]: ")
 if not mldom:
-    mldom = "*"
+    mldom = input("Which domains would you accept mail to from web-replies? [*]: ")
+    if not mldom:
+        mldom = "*"
 
 while wc.lower() not in ["y", "n"]:
     wc = input("Would you like to enable the word cloud feature? (Y/N) [Y]: ").lower()
@@ -283,7 +288,7 @@ while genname == "":
     except ValueError:
         pass
 
-if genname == "dkim" and nonce is None:
+if genname == "dkim" and (nonce is None and not args.defaults):
     print(
         "DKIM hasher chosen. It is recommended you set a cryptographic nonce for this generator, though not required."
     )