[incubator-ponymail-foal] branch master updated (ac40f55 -> 07343c4)

[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 ac40f55  Get started on a basic installation doc
     new a5a8a74  fix some errors
     new 07343c4  seed UI config options that the backend needs

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 | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

[incubator-ponymail-foal] 01/02: fix some errors

[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 a5a8a74df3677b92aef42e7c8b6181ac5e90031d
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 8 18:05:09 2020 +0200

    fix some errors
    
    -  --nocloud didn't work
    - Make a .tmp file if server yaml exists
---
 tools/setup.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/setup.py b/tools/setup.py
index 95220a0..413c4eb 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -211,7 +211,8 @@ if args.mldom:
 if args.wc:
     wc = args.wc
 if args.nwc:
-    wc = False
+    wc = "n"
+    wce = False
 if args.dbshards:
     shards = args.dbshards
 if args.dbreplicas is not None: # Allow for 0 value
@@ -425,8 +426,13 @@ if not os.path.exists("../site/js/config.js") and os.path.exists(
 ):
     shutil.copy("../site/js/config.js.sample", "../site/js/config.js")
 
-print("Writing UI backend configuration file ponymail.yaml")
-with open("../server/ponymail.yaml", "w") as f:
+server_cfg  = "../server/ponymail.yaml"
+if not args.clobber and os.path.exists(server_cfg):
+    print("%s exists and clobber is not set" % server_cfg)
+    server_cfg = "../server/ponymail.yaml.tmp"
+
+print("Writing UI backend configuration file %s" % server_cfg)
+with open(server_cfg, "w") as f:
     f.write("""
 server:
   port: 8080             # Port to bind to

[incubator-ponymail-foal] 02/02: seed UI config options that the backend needs

[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 07343c437fa5b78d84847c86d91022c34d354c07
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 8 18:06:09 2020 +0200

    seed UI config options that the backend needs
---
 tools/setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/setup.py b/tools/setup.py
index 413c4eb..48e45b4 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -447,6 +447,11 @@ database:
   db_prefix: %s    # DB prefix, usually 'ponymail'
   max_hits: 15000        # Maximum number of emails to process in a search
 
+ui:
+  wordcloud:       %s
+  mailhost:        %s
+  sender_domains:  %s
+
 tasks:
   refresh_rate:  150     # Background indexer run interval, in seconds
 
@@ -456,7 +461,7 @@ oauth:
   github_client_id:     ~
   github_client_secret: ~
 
-""" % (hostname,  port, dbname))
+""" % (hostname,  port, dbname, "true" if wce else "false", mlserver, mldom))
 
 
 print("All done, Pony Mail should...work now :)")