[incubator-ponymail-foal] branch master updated: nonce is not defined so yaml create fails

[se...@apache.org]

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

sebb 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 e7e55f2  nonce is not defined so yaml create fails
e7e55f2 is described below

commit e7e55f26ff35f44fbb6b4a086bd279c9f717f7b9
Author: Sebb <se...@apache.org>
AuthorDate: Mon Aug 17 16:38:46 2020 +0100

    nonce is not defined so yaml create fails
---
 tools/ponymail.yaml.tmp | 41 +++++++++++++++++++++++++++++++++++++++++
 tools/setup.py          |  2 ++
 2 files changed, 43 insertions(+)

diff --git a/tools/ponymail.yaml.tmp b/tools/ponymail.yaml.tmp
new file mode 100644
index 0000000..987ca17
--- /dev/null
+++ b/tools/ponymail.yaml.tmp
@@ -0,0 +1,41 @@
+
+---
+###############################################################
+# A ponymail.yaml is needed to run this project. This sample config file was
+# originally generated by tools/setup.py.
+# 
+# Run the tools/setup.py script and a ponymail.yaml which looks a lot like this 
+# one will be generated. If, for whatever reason, that script is not working 
+# for you, you may use this ponymail.cfg as a starting point.
+# 
+# Contributors should strive to keep this sample updated. One way to do this 
+# would be to run the tools/setup.py, rename the generated config to
+# ponymail.cfg.sample, and then pasting this message or a modified form of 
+# this message at the top.
+###############################################################
+
+###############################################################
+# Pony Mail Configuration file
+
+
+# Main ES configuration
+elasticsearch:
+    hostname:               localhost
+    dbname:                 ponymail
+    port:                   9200
+    ssl:                    false
+    #uri:                   url_prefix
+    #user:                  username
+    #password:              password
+    #wait:                  active shard count
+    #backup:                database name
+
+archiver:
+    #generator:             medium|full|cluster|dkim|other (dkim recommended)
+    generator:              cluster
+    nonce:                  ~
+
+debug:
+    #cropout:               string to crop from list-id
+
+            
\ No newline at end of file
diff --git a/tools/setup.py b/tools/setup.py
index f88c3e6..3eba8cd 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -128,6 +128,7 @@ wce = False
 shards = 0
 replicas = -1
 urlPrefix = None
+nonce = None
 
 # If called with --defaults (like from Docker), use default values
 if args.defaults:
@@ -142,6 +143,7 @@ if args.defaults:
     replicas = 0
     genname = "cluster"
     urlPrefix = ""
+    nonce = None
 
 # Accept CLI args, copy them
 if args.dbprefix: