You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2020/08/21 10:20:47 UTC
[incubator-ponymail-foal] branch master updated (d48aeb1 -> 05d3c1e)
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from d48aeb1 It's an example file, name accordingly
new 3a179bf Config file should not be in repository
new bb8a762 Don't store local config in git
new 05d3c1e Trailing spaces
The 3 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:
.github/workflows/unittest.yml | 1 +
.gitignore | 3 +++
tools/ponymail.yaml | 44 ------------------------------------------
tools/ponymail.yaml.example | 10 ++++------
4 files changed, 8 insertions(+), 50 deletions(-)
delete mode 100644 tools/ponymail.yaml
[incubator-ponymail-foal] 01/03: Config file should not be in
repository
Posted by 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
commit 3a179bf8f3c3522d2001cff43a9f6a30068f96e2
Author: Sebb <se...@apache.org>
AuthorDate: Fri Aug 21 11:16:51 2020 +0100
Config file should not be in repository
---
.github/workflows/unittest.yml | 1 +
tools/ponymail.yaml | 44 ------------------------------------------
2 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 7fbd6c2..6c9f986 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -32,5 +32,6 @@ jobs:
# pytest
- name: Test with Ponymail Unit tests
run: |
+ sed -e '/incubator/s/# cropout:/cropout:/' tools/ponymail.yaml.example >tools/ponymail.yaml
cd pmtests
python runall.py --root ..
diff --git a/tools/ponymail.yaml b/tools/ponymail.yaml
deleted file mode 100644
index 2817c6e..0000000
--- a/tools/ponymail.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-###############################################################
-# A ponymail.cfg 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.cfg 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
-
-
-
-##############################################################
-# THIS IS AN EXAMPLE FOR TESTING - RUN setup.py PLEASE #
-##############################################################
-
-# 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: dkim
-
-debug:
- #cropout: string to crop from list-id
- # e.g. Strip out incubator except at top level
- cropout: (\w+\.\w+)\.incubator\.apache\.org \1.apache.org
[incubator-ponymail-foal] 03/03: Trailing spaces
Posted by 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
commit 05d3c1e5581a7c8b053f9cb59506fc2fb6ccaf73
Author: Sebb <se...@apache.org>
AuthorDate: Fri Aug 21 11:20:31 2020 +0100
Trailing spaces
---
tools/ponymail.yaml.example | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tools/ponymail.yaml.example b/tools/ponymail.yaml.example
index febb7a6..2924085 100644
--- a/tools/ponymail.yaml.example
+++ b/tools/ponymail.yaml.example
@@ -4,13 +4,13 @@
# 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
+# 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
+# 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
+# ponymail.cfg.sample, and then pasting this message or a modified form of
# this message at the top.
###############################################################
@@ -43,5 +43,3 @@ debug:
#cropout: string to crop from list-id
# e.g. Strip out incubator except at top level
# cropout: (\w+\.\w+)\.incubator\.apache\.org \1.apache.org
-
-
\ No newline at end of file
[incubator-ponymail-foal] 02/03: Don't store local config in git
Posted by 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
commit bb8a762218081a9c5cf18522c1905b3de184b585
Author: Sebb <se...@apache.org>
AuthorDate: Fri Aug 21 11:19:12 2020 +0100
Don't store local config in git
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index c5be0fa..805a6bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@ __pycache__/
# C extensions
*.so
+# Local configuration files
+tools/ponymail.yaml
+
# Distribution / packaging
.Python
build/