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

[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 07343c4  seed UI config options that the backend needs
     new 7955cb7  add UI options to config object
     new 25f32c2  Add a commented-out auth_domains example

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:
 server/plugins/configuration.py | 13 +++++++++++++
 tools/setup.py                  |  5 +++++
 2 files changed, 18 insertions(+)

[incubator-ponymail-foal] 02/02: Add a commented-out auth_domains example

[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 25f32c270bbd39682d871e83fcc03a09a9bfa5a6
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 8 18:16:10 2020 +0200

    Add a commented-out auth_domains example
---
 tools/setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/setup.py b/tools/setup.py
index 48e45b4..bcc8ccc 100755
--- a/tools/setup.py
+++ b/tools/setup.py
@@ -457,6 +457,11 @@ tasks:
 
 # Fill in OAuth data as needed
 oauth:
+# If using OAuth, set the authoritative domains here. These are the OAuth domains that 
+# will provide access to private emails.
+#  authoritative_domains:
+#    - googleapis.com  # OAuth via google is authoritative
+#    - github.com      # GitHub OAuth is authoritative
   google_client_id:     ~
   github_client_id:     ~
   github_client_secret: ~

[incubator-ponymail-foal] 01/02: add UI options to config object

[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 7955cb7da497140f74bb9fe0ac76c55c05ab2d32
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Sep 8 18:10:07 2020 +0200

    add UI options to config object
---
 server/plugins/configuration.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/server/plugins/configuration.py b/server/plugins/configuration.py
index 458165e..7ab746b 100644
--- a/server/plugins/configuration.py
+++ b/server/plugins/configuration.py
@@ -14,6 +14,17 @@ class TaskConfig:
         self.refresh_rate = int(subyaml.get("refresh_rate", 150))
 
 
+class UIConfig:
+    wordcloud:      bool
+    mailhost:       str
+    sender_domains: str
+
+    def __init__(self, subyaml: dict):
+        self.wordcloud = bool(subyaml.get('wordcloud', False))
+        self.mailhost = subyaml.get('mailhost', '')  # Default to nothing (disabled)
+        self.sender_domains = subyaml.get('sender_domains', '')  # Default to nothing (disabled)
+
+
 class OAuthConfig:
     authoritative_domains: list
     google_client_id: str
@@ -49,12 +60,14 @@ class Configuration:
     database: DBConfig
     tasks: TaskConfig
     oauth: OAuthConfig
+    ui: UIConfig
 
     def __init__(self, yml: dict):
         self.server = ServerConfig(yml.get("server", {}))
         self.database = DBConfig(yml.get("database", {}))
         self.tasks = TaskConfig(yml.get("tasks", {}))
         self.oauth = OAuthConfig(yml.get("oauth", {}))
+        self.ui = UIConfig(yml.get("ui", {}))
 
 
 class InterData: