| From commits-return-77-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 04:17:05 2016 |
| Return-Path: <commits-return-77-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 4D9CB200B13 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 06:17:05 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 4C3E9160A46; Wed, 1 Jun 2016 04:17:05 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 9620B160A44 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 06:17:04 +0200 (CEST) |
| Received: (qmail 5299 invoked by uid 500); 1 Jun 2016 04:17:03 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 5290 invoked by uid 99); 1 Jun 2016 04:17:03 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:17:03 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 5BEFC180589 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 04:17:03 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx2-lw-us.apache.org ([10.40.0.8]) |
| by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) |
| with ESMTP id rl8HxcZo6MjI for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 04:17:01 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 08BC05FB23 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 04:17:00 +0000 (UTC) |
| Received: (qmail 5282 invoked by uid 99); 1 Jun 2016 04:17:00 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:17:00 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 486F2DFB74; Wed, 1 Jun 2016 04:17:00 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 04:17:00 -0000 |
| Message-Id: <4475c7c2e3b24fde8be96d3f87bd2f13@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [1/2] incubator-ponymail-site git commit: turn h1-h6 into links, |
| using the title as ID |
| archived-at: Wed, 01 Jun 2016 04:17:05 -0000 |
| |
| Repository: incubator-ponymail-site |
| Updated Branches: |
| refs/heads/asf-site f1083e144 -> 44f3401f0 |
| |
| |
| turn h1-h6 into links, using the title as ID |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/93465c22 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/93465c22 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/93465c22 |
| |
| Branch: refs/heads/asf-site |
| Commit: 93465c223e279718638d8a3a91e5e11f7b196c0f |
| Parents: f1083e1 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 06:14:43 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 06:14:43 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| source/generate.py | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/93465c22/source/generate.py |
| ---------------------------------------------------------------------- |
| diff --git a/source/generate.py b/source/generate.py |
| index 9c76c4f..4de9c47 100644 |
| --- a/source/generate.py |
| +++ b/source/generate.py |
| @@ -22,6 +22,14 @@ def runDir(path): |
| text = re.sub(r"~~~([\s\S]+?)~~~", "<pre>\\1</pre>", text, flags=re.MULTILINE) |
| text = re.sub(r"([A-Z/]+)\.md", lambda x: x.group(1).lower() + ".html", text, flags =re.MULTILINE) |
| html = markdown.markdown(text) |
| + # Convert h1-h6 into links |
| + html = re.sub(r"<h([1-6])>(.+?)</h[1-6]>", lambda x: "<h%s id='%s'>%s</h%s>" % ( |
| + x.group(1), |
| + re.sub(r"[^a-z0-9]+", "", x.group(2).lower()), |
| + x.group(2), |
| + x.group(1) |
| + ) |
| + , html) |
| html = template.replace("%CONTENT%", html, 1) |
| print("Writing %s..." % outfile) |
| bpath = os.path.dirname(outfile) |
| |
| |
| From commits-return-78-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 04:17:11 2016 |
| Return-Path: <commits-return-78-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id AF176200B13 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 06:17:11 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id AD9D4160A46; Wed, 1 Jun 2016 04:17:11 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 2FB7E160A44 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 06:17:10 +0200 (CEST) |
| Received: (qmail 5361 invoked by uid 500); 1 Jun 2016 04:17:09 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 5352 invoked by uid 99); 1 Jun 2016 04:17:09 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:17:09 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id DD1151A06D4 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 04:17:08 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -3.896 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-3.896 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_INFOUSMEBIZ=0.75, |
| KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, |
| RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) |
| with ESMTP id b7bk-ucuYK_l for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 04:17:03 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7C8DA5F296 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 04:17:01 +0000 (UTC) |
| Received: (qmail 5285 invoked by uid 99); 1 Jun 2016 04:17:00 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:17:00 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 4C2A2DFE61; Wed, 1 Jun 2016 04:17:00 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 04:17:01 -0000 |
| Message-Id: <5c28039bbe864273b1eba0051aea3a2e@git.apache.org> |
| In-Reply-To: <4475c7c2e3b24fde8be96d3f87bd2f13@git.apache.org> |
| References: <4475c7c2e3b24fde8be96d3f87bd2f13@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [2/2] incubator-ponymail-site git commit: regen |
| archived-at: Wed, 01 Jun 2016 04:17:11 -0000 |
| |
| regen |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/44f3401f |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/44f3401f |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/44f3401f |
| |
| Branch: refs/heads/asf-site |
| Commit: 44f3401f0ddc9921cd7cd6c42205f7cada757670 |
| Parents: 93465c2 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 06:15:03 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 06:15:03 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| content/about.html | 8 ++++---- |
| content/contribute.html | 10 +++++----- |
| content/docs.html | 6 +++--- |
| content/docs/api.html | 10 +++++----- |
| content/docs/archiving.html | 22 +++++++++++----------- |
| content/docs/building.html | 4 ++-- |
| content/docs/contributing.html | 8 ++++---- |
| content/docs/importing.html | 20 ++++++++++---------- |
| content/docs/install.centos.html | 2 +- |
| content/docs/install.debian.html | 2 +- |
| content/docs/install.fedora.html | 2 +- |
| content/docs/install.ubuntu.html | 2 +- |
| content/docs/installing.html | 34 +++++++++++++++++----------------- |
| content/downloads.html | 2 +- |
| content/index.html | 8 ++++---- |
| content/source.html | 2 +- |
| content/support.html | 2 +- |
| 17 files changed, 72 insertions(+), 72 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/about.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/about.html b/content/about.html |
| index 6151bab..15c5dd3 100644 |
| --- a/content/about.html |
| +++ b/content/about.html |
| @@ -33,8 +33,8 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>About Pony Mail and its Contributors</h1> |
| -<h3>Background</h3> |
| +<h1 id='aboutponymailanditscontributors'>About Pony Mail and its Contributors</h1> |
| +<h3 id='background'>Background</h3> |
| <p>Pony Mail began as a response to two things; the lack of diversity in |
| mailing list archives that are less bureaucratic all-or-nothing and more |
| fluid way to interact with mailing lists than what is typically offered, |
| @@ -54,7 +54,7 @@ are?) and then try to get them into your mail client (which never works) |
| and then reply to it. Which will break threading, because you did |
| something wrong. Then you tear out your hair. PONY MAIL TO THE RESCUE!!! |
| (sound of hoof beats)</q></p> |
| -<h3>Rationale</h3> |
| +<h3 id='rationale'>Rationale</h3> |
| <p>One of the oft-heard complaints about Apache's development model is that |
| mailing lists are an old person's tool, and web-based communication - |
| forums - are the way to go in the 21st Century. Providing a |
| @@ -72,7 +72,7 @@ through hoops to join a mailing list conversation drives away a lot of |
| people (at least, anecdotally, it does) and if we can remove that |
| barrier I think we'll have an easier time of drawing a new generation |
| into our projects.</p> |
| -<h3>Who are we?</h3> |
| +<h3 id='whoarewe'>Who are we?</h3> |
| <p>We're a small bunch of people committed to making mailing list interaction as easy as possible.<br/> |
| Currently, we consist of (in alphabetical order):<br/> |
| <ul> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/contribute.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/contribute.html b/content/contribute.html |
| index 8e8f33c..86dc70a 100644 |
| --- a/content/contribute.html |
| +++ b/content/contribute.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Contributing to Pony Mail</h1> |
| +<h1 id='contributingtoponymail'>Contributing to Pony Mail</h1> |
| <p>We'd LOVE if more people would contribute to Pony Mail! |
| Any form of contribution is most welcome, whether it be programming, |
| documentation, evangelism, marketing, or helping out other users.</p> |
| @@ -55,9 +55,9 @@ documentation, evangelism, marketing, or helping out other users.</p> |
| <li>Let us know what you want to do, and we'll add you to our contributors list!</li> |
| <li>Join us on #ponymail on the Freenode IRC network</li> |
| </ul> |
| -<h2>Git Workflow</h2> |
| +<h2 id='gitworkflow'>Git Workflow</h2> |
| <p>The following workflow is adapted from the <a href="https://cwiki.apache.org/confluence/display/JCLOUDS/Git+workflow">jClouds workflow</a>:</p> |
| -<h4>Prepare your fork</h4> |
| +<h4 id='prepareyourfork'>Prepare your fork</h4> |
| <p>The first thing to do is to make sure you have the ponymail Git |
| repository configured as a remote. In this case we will add it as a |
| remote called "ponymail": |
| @@ -65,7 +65,7 @@ remote called "ponymail": |
| cd ponymail |
| git remote add ponymail https://git-wip-us.apache.org/repos/asf/incubator-ponymail.git |
| </pre></p> |
| -<h4>Create the feature branch</h4> |
| +<h4 id='createthefeaturebranch'>Create the feature branch</h4> |
| <p>When beginning working on the feature, take a branch from the latest master version: |
| <pre> |
| git checkout master |
| @@ -102,7 +102,7 @@ git push <your-fork's-remote> feature-branch -f # You might need to push w |
| </pre></p> |
| <p>Now the pull request will be clean with one single commit and up to date |
| with the latest master. Ready to be merged!</p> |
| -<h4>A note about keeping the pull request up to date</h4> |
| +<h4 id='anoteaboutkeepingthepullrequestuptodate'>A note about keeping the pull request up to date</h4> |
| <p>The key point is to <em>avoid</em> updating your feature branch with master |
| until the PR is ready to be merged (or until you're asked to rebase). |
| This way you'll avoid accidental merge commits and fixing conflicts when |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs.html b/content/docs.html |
| index dd3784c..1a80f7c 100644 |
| --- a/content/docs.html |
| +++ b/content/docs.html |
| @@ -33,9 +33,9 @@ |
| </ul> |
| </div> |
| </div> |
| -<h3>Getting started</h3> |
| +<h3 id='gettingstarted'>Getting started</h3> |
| <p>(Optionally see the <a href="/docs/installing.html">detailed installation instructions</a> for more information)</p> |
| -<h4>Supported Linux Distributions</h4> |
| +<h4 id='supportedlinuxdistributions'>Supported Linux Distributions</h4> |
| <p>For a quick guide to installing Pony Mail, please see the guides for:</p> |
| <ul> |
| <li><a href="/docs/install.debian.html">Debian (Jessie) Installation Instructions</a></li> |
| @@ -43,7 +43,7 @@ |
| <li><a href="/docs/install.centos.html">CentOS (7.1) Installation Instructions</a></li> |
| <li><a href="/docs/install.fedora.html">Fedora (22) Installation Instructions</a></li> |
| </ul> |
| -<h4>Generic installation instructions</h4> |
| +<h4 id='genericinstallationinstructions'>Generic installation instructions</h4> |
| <ol> |
| <li>Install Apache httpd + mod_lua and the lua libs (see http://modlua.org/gs/installing if need be)</li> |
| <li>Install ElasticSearch</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/api.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/api.html b/content/docs/api.html |
| index 870c3fa..1dbb228 100644 |
| --- a/content/docs/api.html |
| +++ b/content/docs/api.html |
| @@ -33,8 +33,8 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Pony Mail Archive API</h1> |
| -<h3>Fetching a specific email:</h3> |
| +<h1 id='ponymailarchiveapi'>Pony Mail Archive API</h1> |
| +<h3 id='fetchingaspecificemail'>Fetching a specific email:</h3> |
| <p>Usage: |
| <code>GET /api/email.lua?id=$mid</code></p> |
| <p>Parameters: (cookie may be required) |
| @@ -64,7 +64,7 @@ |
| } |
| </pre> |
| |
| -<h3>Fetching list data</h3> |
| +<h3 id='fetchinglistdata'>Fetching list data</h3> |
| <p>Usage: |
| <code>GET /api/stats.lua?list=$list&domain=$domain[&d=$timespan][&q=$query][&header_from=$from][&header_subject=$subject]</code></p> |
| <p>Parameters: |
| @@ -99,7 +99,7 @@ |
| } |
| </pre> |
| |
| -<h3>Fetching preferences and quick list overview</h3> |
| +<h3 id='fetchingpreferencesandquicklistoverview'>Fetching preferences and quick list overview</h3> |
| <p>Usage: |
| <code>GET /api/preferences.lua[?logout=true]</code></p> |
| <p>Parameters: (cookie required) |
| @@ -137,7 +137,7 @@ |
| } |
| </pre> |
| |
| -<h3>Fetching notifications for a logged in user</h3> |
| +<h3 id='fetchingnotificationsforaloggedinuser'>Fetching notifications for a logged in user</h3> |
| <p>Usage: |
| <code>GET /api/notifications.lua</code></p> |
| <p>Parameters: <code>None</code> (cookie required)</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/archiving.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/archiving.html b/content/docs/archiving.html |
| index 27e2531..d3756cc 100644 |
| --- a/content/docs/archiving.html |
| +++ b/content/docs/archiving.html |
| @@ -33,24 +33,24 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Archiving New Emails to Pony Mail</h1> |
| +<h1 id='archivingnewemailstoponymail'>Archiving New Emails to Pony Mail</h1> |
| <p>This document exists to extend the <a href="installing.html">general install guide</a> provide examples on how to archive emails.</p> |
| <p><strong>Note:</strong> If you plan on <a href="importing.html">importing old emails from an archive</a>, |
| please set up the archiver <strong>first</strong> so as to create an overlap of new emails |
| coming in and old emails being imported. The system is designed to handle this |
| without creating duplicate entries in the archive.</p> |
| -<h2>Mailman 2.x example:</h2> |
| +<h2 id='mailman2xexample'>Mailman 2.x example:</h2> |
| <p>Set up a Pony Mail mail account/alias on a machine. This can be your local mail |
| server, it can be the machine that Pony Mail is on (install sendmail or postfix |
| etc there), or it can be any other machine with access to the ElasticSearch |
| database that Pony Mail uses.</p> |
| -<h3>Pre-requisites</h3> |
| +<h3 id='prerequisites'>Pre-requisites</h3> |
| <p>If this is not the machine Pony Mail was installed on, you'll need to copy the |
| tools/ directory from your Pony Mail installation to this machine and adjust |
| ponymail.cfg to point to the right place for the database. You will also need |
| Python 3 and the helper libraries installed |
| (<code>pip3 install elasticsearch formatflowed netaddr</code>)</p> |
| -<h3>Create an alias:</h3> |
| +<h3 id='createanalias'>Create an alias:</h3> |
| <p>Set up a mail alias for public and private lists in <code>/etc/aliases</code> or similar method, |
| and point them at the archiver script in tools/:</p> |
| <pre> |
| @@ -60,13 +60,13 @@ foo-private: "|/usr/bin/python3 /path/to/tools/archiver.py --private" |
| </pre> |
| |
| <p>Once done, run <code>newaliases</code> to update your alias DB.</p> |
| -<h3>Subscribe the aliases to your mailing lists</h3> |
| +<h3 id='subscribethealiasestoyourmailinglists'>Subscribe the aliases to your mailing lists</h3> |
| <p>Use the mailman UI or CLI to subscribe foo-public@ to your public lists and |
| foo-private to your private lists. Don't worry, the contents of private lists |
| are hidden by default till the correct AAA scripting is set up.</p> |
| -<h2>ezmlm example:</h2> |
| +<h2 id='ezmlmexample'>ezmlm example:</h2> |
| <p>First, see the general introduction in the MM2 example, as this applies here as well.</p> |
| -<h3>Create an alias:</h3> |
| +<h3 id='createanalias'>Create an alias:</h3> |
| <p>Set up a dot-forward file for a public and a private alias:</p> |
| <pre> |
| .qmail-archive-public: |
| @@ -76,11 +76,11 @@ are hidden by default till the correct AAA scripting is set up.</p> |
| "|/usr/bin/python3 /path/to/tools/archiver.py --private" |
| </pre> |
| |
| -<h3>Subscribe the aliases to your mailing lists</h3> |
| +<h3 id='subscribethealiasestoyourmailinglists'>Subscribe the aliases to your mailing lists</h3> |
| <p>Use the ezmlm CLI to subscribe your new aliases to the lists: |
| <code>ezmlm-sub foolist/ archive-public@yourhost.tld</code> |
| <code>ezmlm-sub secretlist/ archive-private@yourhost.tld</code></p> |
| -<h2>Setting up AAA</h2> |
| +<h2 id='settingupaaa'>Setting up AAA</h2> |
| <p>If you have an custom OAuth2 provider and a binary approach to private access |
| (either/or), you can enable private access to people by having a key/value pair |
| called <code>isMember</code> set to <code>true</code> in your JSON response from the OAuth server, |
| @@ -88,11 +88,11 @@ provided it is set as an authority in config.lua. This will provide anyone |
| defined as a member via OAuth full access to all private lists.</p> |
| <p>If you use LDAP, you can modify the LDAP queries in the example AAA file to suit |
| your organization.</p> |
| -<h2>Importing/Archiving HTML-only emails</h2> |
| +<h2 id='importingarchivinghtmlonlyemails'>Importing/Archiving HTML-only emails</h2> |
| <p>Should you need to import HTML-only emails into the archive, you may enable this |
| with the <code>--html2text</code> command line arg. This requires that the <code>html2text</code> Python3 package |
| is installed beforehand.</p> |
| -<h2>Munging list IDs</h2> |
| +<h2 id='munginglistids'>Munging list IDs</h2> |
| <p>If you need to rewrite list IDs on the fly as emails come in, you can use the debug.cropout |
| setting for this (in <code>ponymail.cfg</code>). </p> |
| <p>You can either use it to just crop away something: |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/building.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/building.html b/content/docs/building.html |
| index e78d900..1f70a07 100644 |
| --- a/content/docs/building.html |
| +++ b/content/docs/building.html |
| @@ -33,12 +33,12 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Building Pony Mail for Production</h1> |
| +<h1 id='buildingponymailforproduction'>Building Pony Mail for Production</h1> |
| <p>Most of Pony Mail is ready-for-deployment files that just need to be checked out |
| in order to work. Some areas, such as the JavaScript needs to be combined by a script, |
| as they have been split into several smaller files to make it easier to find and |
| work on various elements of the rendering process.</p> |
| -<h3>Building the JavaScript chunks</h3> |
| +<h3 id='buildingthejavascriptchunks'>Building the JavaScript chunks</h3> |
| <p>All JavaScript edits should be done to the <code>site/js/dev/*.js</code> files. |
| Once done, you should run combine.sh in the <code>site/js/dev</code> directory |
| to generate ponymail.js from the scripts in the dev dir:</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/contributing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/contributing.html b/content/docs/contributing.html |
| index fdcb7eb..269d388 100644 |
| --- a/content/docs/contributing.html |
| +++ b/content/docs/contributing.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Contributing to Pony Mail</h1> |
| +<h1 id='contributingtoponymail'>Contributing to Pony Mail</h1> |
| <p>We'd LOVE it if more people would contribute to Pony Mail! |
| Any form of contribution is most welcome, whether it be programming, |
| documentation, evangelism, marketing, or helping out other users.</p> |
| @@ -41,10 +41,10 @@ documentation, evangelism, marketing, or helping out other users.</p> |
| are always on the lookout for user experiences. If you have used |
| Pony Mail and have feedback or ideas you wish to share, please let |
| us know either through an issue/PR here or on the mailing list.</p> |
| -<h2>Code</h2> |
| +<h2 id='code'>Code</h2> |
| <p>The Pony Mail code is on GitHub at https://github.com/apache/incubator-ponymail |
| and pull requests are welcome.</p> |
| -<h2>Mailing lists</h2> |
| +<h2 id='mailinglists'>Mailing lists</h2> |
| <p>Developers list: |
| - list: dev@ponymail.incubator.apache.org |
| - subscribe addr: dev-subscribe@ponymail.incubator.apache.org |
| @@ -53,7 +53,7 @@ and pull requests are welcome.</p> |
| - list: issues@ponymail.incubator.apache.org |
| - subscribe addr: issues-subscribe@ponymail.incubator.apache.org |
| - Online version: http://lists.apache.org/list.html?bugs@ponymail.incubator.apache.org</p> |
| -<h2>Chat</h2> |
| +<h2 id='chat'>Chat</h2> |
| <p>IRC: |
| - #ponymail on Freenode</p> |
| <h4><a id="disclaimer"></a>Disclaimer</h4> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/importing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/importing.html b/content/docs/importing.html |
| index 0b03ba9..3e10431 100644 |
| --- a/content/docs/importing.html |
| +++ b/content/docs/importing.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Importing Data to Pony Mail</h1> |
| +<h1 id='importingdatatoponymail'>Importing Data to Pony Mail</h1> |
| <p>Pony Mail supports many ways of importing your old mail archives via the |
| <code>import-mbox.py</code> script. For command line argument tips, run <code>python3 |
| import-mbox.py --help</code>.</p> |
| @@ -42,37 +42,37 @@ import from the same source multiple times without creating duplicate emails in |
| the archive. Both the archiver and the importer use the same digest method, so |
| they can overlap. Usually, you'll want to set up the archiver first, and when |
| emails start flowing through it, you'll use the importer to import older emails.</p> |
| -<h2>Importing attachments</h2> |
| +<h2 id='importingattachments'>Importing attachments</h2> |
| <p>If you wish to import attached files, add the <code>--attachments</code> flag to your import command, otherwise, attachments will be stripped.</p> |
| -<h2>Importing from mod_mbox</h2> |
| -<h3>Importing a single domain</h3> |
| +<h2 id='importingfrommodmbox'>Importing from mod_mbox</h2> |
| +<h3 id='importingasingledomain'>Importing a single domain</h3> |
| <p>Provided you have the main mod_mbox page at https://your.tld/mod_mbox/ and your (sub)domain resources at |
| https://your.tld/mod_mbox/$list-yourdomain/, you can import all lists from that domain using:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox --project yourdomain</code></p> |
| <p>For a quick update, which only imports the last 2 months of mail, append then <code>--quick</code> flag.</p> |
| <p>You can also import just a single list by specifying that list ID:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox --project listname-yourdomain</code></p> |
| -<h3>Importing an entire archive (multiple domains)</h3> |
| +<h3 id='importinganentirearchivemultipledomains'>Importing an entire archive (multiple domains)</h3> |
| <p>To import an entire site, use the same command as above, but omit the <code>--project</code> flag</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox</code></p> |
| -<h3>Setting the domain or list id properly in case of variance</h3> |
| +<h3 id='settingthedomainorlistidproperlyincaseofvariance'>Setting the domain or list id properly in case of variance</h3> |
| <p>If your old archive varies in terms of list IDs across time, you can force harmonization by using the <code>--lid</code> or <code>--domain</code> flags:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox --project listid-yourdomain --lid "<listid.youdomain.tld>"</code></p> |
| <p>This should only be done one list at a time.</p> |
| -<h2>Importing from Pipermail</h2> |
| +<h2 id='importingfrompipermail'>Importing from Pipermail</h2> |
| <p>To import from pipermail, you will have to run the import one list at a time. As with mod_mbox imports, you must specify a source, but use <code>--pipermail</code> instead of <code>--mod-mbox</code>:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/pipermail/foolist/ --pipermail</code></p> |
| -<h3>Pipermail and html-only emails</h3> |
| +<h3 id='pipermailandhtmlonlyemails'>Pipermail and html-only emails</h3> |
| <p>While you can convert HTML-only emails to text using <code>--html2text</code>, Pipermail has some peculiarities |
| where it adds a text/plain message to these emails, thus preventing html2text from working. You can |
| circumvent this by using the <code>--ignorebody "foo"</code> arg to ignore all text/plain bodies containing <code>foo</code>.</p> |
| <p>While the <code>project</code> flag is not needed here, you may wish to specify the list ID for the import.</p> |
| -<h2>Importing from locally stored mbox files</h2> |
| +<h2 id='importingfromlocallystoredmboxfiles'>Importing from locally stored mbox files</h2> |
| <p>To import from one or more local mbox files, specify a filesystem path as the source:</p> |
| <p><code>python3 import-mbox.py --source /tmp/mylists/ --attachments</code></p> |
| <p>If you have a mix of mbox and non-mbox files in the specific dir, you may wish to let Pony Mail know which files to scan:</p> |
| <p><code>python3 import-mbox.py --source /tmp/mylists/ --ext .mbox --attachments</code></p> |
| -<h2>Test archives</h2> |
| +<h2 id='testarchives'>Test archives</h2> |
| <p>We have a few test archives for those that wish to test large imports. |
| They can be found in gzip format at <a href="http://ponymail.info/mboxes/">http://ponymail.info/mboxes/</a></p> |
| <h4><a id="disclaimer"></a>Disclaimer</h4> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/install.centos.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.centos.html b/content/docs/install.centos.html |
| index 1c786fa..80fb221 100644 |
| --- a/content/docs/install.centos.html |
| +++ b/content/docs/install.centos.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Installing Pony Mail on CentOS 7.1:</h1> |
| +<h1 id='installingponymailoncentos71'>Installing Pony Mail on CentOS 7.1:</h1> |
| <p>This installation is a bit trickier, as CentOS does not have |
| Python 3 or any of the lua modules in its default package system.</p> |
| <p>Start by installing the following CentOS packages:</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/install.debian.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.debian.html b/content/docs/install.debian.html |
| index 172a5ef..68129af 100644 |
| --- a/content/docs/install.debian.html |
| +++ b/content/docs/install.debian.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Installing Pony Mail on Debian Jessie:</h1> |
| +<h1 id='installingponymailondebianjessie'>Installing Pony Mail on Debian Jessie:</h1> |
| <p>Start by installing the following Debian packages:</p> |
| <ul> |
| <li>apache2</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/install.fedora.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.fedora.html b/content/docs/install.fedora.html |
| index 37220cb..07260de 100644 |
| --- a/content/docs/install.fedora.html |
| +++ b/content/docs/install.fedora.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Installing Pony Mail on Fedora 22:</h1> |
| +<h1 id='installingponymailonfedora22'>Installing Pony Mail on Fedora 22:</h1> |
| <p>Start by installing the following Fedora packages:</p> |
| <ul> |
| <li>httpd</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/install.ubuntu.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.ubuntu.html b/content/docs/install.ubuntu.html |
| index 4645f0f..455e1e6 100644 |
| --- a/content/docs/install.ubuntu.html |
| +++ b/content/docs/install.ubuntu.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Installing Pony Mail on Ubuntu 14.04 or 16.04:</h1> |
| +<h1 id='installingponymailonubuntu1404or1604'>Installing Pony Mail on Ubuntu 14.04 or 16.04:</h1> |
| <p>Start by installing the following Ubuntu packages:</p> |
| <ul> |
| <li>apache2</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/docs/installing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/installing.html b/content/docs/installing.html |
| index b764985..bfb390a 100644 |
| --- a/content/docs/installing.html |
| +++ b/content/docs/installing.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Installing Pony Mail</h1> |
| +<h1 id='installingponymail'>Installing Pony Mail</h1> |
| <p>If your distro is on this list, please refer to that specific document |
| for detailed package installation instructions:</p> |
| <ul> |
| @@ -43,7 +43,7 @@ for detailed package installation instructions:</p> |
| <li><a href="install.fedora.html">Fedora (22) Installation Instructions</a></li> |
| </ul> |
| <p>Otherwise, read the next two chapters:</p> |
| -<h2>Pre-requisites</h2> |
| +<h2 id='prerequisites'>Pre-requisites</h2> |
| <p>You will need the following software installed on your machine:</p> |
| <ul> |
| <li>ElasticSearch >= 1.3 (2.0 should also work just fine)</li> |
| @@ -51,7 +51,7 @@ for detailed package installation instructions:</p> |
| <li>Apache HTTP Server 2.4.x with mod_lua (see http://modlua.org/gs/installing if you need to build mod_lua manually)</li> |
| <li>Lua >=5.1 with the following modules: cjson, luasec, luasocket</li> |
| </ul> |
| -<h2>Download and Install</h2> |
| +<h2 id='downloadandinstall'>Download and Install</h2> |
| <ul> |
| <li>Download the git repo: <code>git clone https://github.com/apache/incubator-ponymail.git</code></li> |
| <li>Start ElasticSearch on the machine it needs to run on.</li> |
| @@ -61,7 +61,7 @@ for detailed package installation instructions:</p> |
| ...[follow instructions in the setup script]</code></li> |
| <li>Edit <code>site/js/config.js</code> to suit your needs (usually very little editing is needed)</li> |
| </ul> |
| -<h3>Using auth for ElasticSearch</h3> |
| +<h3 id='usingauthforelasticsearch'>Using auth for ElasticSearch</h3> |
| <p>If your ElasticSearch instance requires authentication for the importer/archiver, please |
| add the following lines in the <code>elasticsearch</code> block of <code>ponymail.cfg</code> once generated:</p> |
| <pre> |
| @@ -69,20 +69,20 @@ user: [username for ES] |
| password: [password for ES] |
| </pre> |
| |
| -<h3>Using Apache HTTP Server:</h3> |
| +<h3 id='usingapachehttpserver'>Using Apache HTTP Server:</h3> |
| <ul> |
| <li>Set up a VirtualHost block in Apache httpd that points to the <code>site/</code> directory in Pony Mail</li> |
| <li>Add the configuration snippets from <code>configs/ponymail_httpd.conf</code> to the virtual host</li> |
| <li>Start Apache httpd to enable the user-facing interface</li> |
| </ul> |
| -<h3>Using nginx:</h3> |
| +<h3 id='usingnginx'>Using nginx:</h3> |
| <ul> |
| <li>To use nginx, you will also need to install the <code>lua-apr</code> module from your distro.</li> |
| <li>Set up a Server block in nginx that points to the <code>site/</code> directory in Pony Mail</li> |
| <li>Add the configuration snippets from <code>configs/ponymail_nginx.conf</code> to the server config</li> |
| <li>Start nginx to enable the user-facing interface</li> |
| </ul> |
| -<h2>Setting up the archiver</h2> |
| +<h2 id='settingupthearchiver'>Setting up the archiver</h2> |
| <p>First off, you will need both <code>tools/archiver.py</code> and the generated |
| <code>tools/ponymail.cfg</code> present on the machine that your mail server runs on. This |
| machine should also have access to the ElasticSearch backend.</p> |
| @@ -105,30 +105,30 @@ header determines the list ID using the --altheader argument, for instance: |
| enable: yes</code></p> |
| <p>For older mailing list systems such as Mailman 2 and ezmlm, you can also |
| tak a look at our <a href="archiving.html">archiving examples</a> page for pointers.</p> |
| -<h2>Public versus private lists</h2> |
| +<h2 id='publicversusprivatelists'>Public versus private lists</h2> |
| <p>In MailMan 3, this should be auto-detected and is not a concern. |
| When using other ML systems via piping to STDIN, you should add |
| the --private arg to the python script to mark an email as private: |
| <code>foolist-private: "|/usr/bin/python3 /path/to/tools/archiver.py --private" |
| foolist-public: "|/usr/bin/python3 /path/to/tools/archiver.py"</code></p> |
| -<h2>Importing old data into Pony Mail</h2> |
| +<h2 id='importingolddataintoponymail'>Importing old data into Pony Mail</h2> |
| <p>See <a href="importing.html">this guide</a> for details on how to import old archives into Pony Mail.</p> |
| -<h2>Bulk editing lists</h2> |
| +<h2 id='bulkeditinglists'>Bulk editing lists</h2> |
| <p>You can use <code>edit-list.py</code> to perform bulk operations: |
| - Rename lists |
| - Mark entire lists are private or public</p> |
| <p>Run <code>python3 edit-list.py --help</code> for CLI args.</p> |
| -<h2>Setting up OAuth for Pony Mail</h2> |
| +<h2 id='settingupoauthforponymail'>Setting up OAuth for Pony Mail</h2> |
| <p>If you want people to be able to log in and reply via the Web UI, you can either |
| use the default Persona login (works for all email addresses) or specify an |
| OAuth provider.</p> |
| -<h3>Setting up or disabling Persona</h3> |
| +<h3 id='settingupordisablingpersona'>Setting up or disabling Persona</h3> |
| <p>Persona is enabled by default, as it's a fast and convenient way to enable |
| logins for <em>public</em> lists. Should you wish to disable Persona, set the |
| <code>enabled</code> variable to <code>false</code> in the persona section of <code>site/js/config.js</code>. |
| Persona will only ever work for public lists. For private lists, you will need |
| to specify and implement an OAuth provider.</p> |
| -<h3>Setting up an OAuth provider</h3> |
| +<h3 id='settingupanoauthprovider'>Setting up an OAuth provider</h3> |
| <p>Pony Mail comes with a few default OAuth examples in <code>site/js/config.js</code>, such |
| as ASF Oauth and Google OAuth. You can enable these by uncommenting the lines in |
| question, or set up your own OAuth portal to handle things. This is a standard |
| @@ -159,7 +159,7 @@ config.lua:</p> |
| <p>If not specified in config.lua, OAuth will only provide users with a place to |
| store settings and notifications, and - provided your mail server is set to accept |
| this - a place to reply to emails in the archive.</p> |
| -<h4>Using GitHub OAuth and other client-secret providers</h4> |
| +<h4 id='usinggithuboauthandotherclientsecretproviders'>Using GitHub OAuth and other client-secret providers</h4> |
| <p>If your OAuth provider requires a client secret, you can specify this in <code>site/api/lib/config.lua</code>, as this GitHub example shows:</p> |
| <pre> |
| oauth_fields = { |
| @@ -172,7 +172,7 @@ this - a place to reply to emails in the archive.</p> |
| </pre> |
| |
| <p>This essentially overrides <code>config.js</code> but without showing the data to anyone outside the server.</p> |
| -<h3>Whitelisting replies via the Web UI</h3> |
| +<h3 id='whitelistingrepliesviathewebui'>Whitelisting replies via the Web UI</h3> |
| <p>To have Pony Mail accept replies done via the Web UI, you must make sure |
| that <code>site/api/lib/config.lua</code> contains the appropriate string (or array of strings) matching the domain(s) you wish to allow new email for. To allow replies to everything, set this to <code>*</code>(NOT RECOMMENDED). |
| You can also allow based on GLOBs or an array of accepted domains and sub-domains:</p> |
| @@ -183,7 +183,7 @@ You can also allow based on GLOBs or an array of accepted domains and sub-domain |
| accepted_domains = { "foo.org", "*.foo.org" } -- Allow posts both to *.foo.org and foo.org |
| </pre> |
| |
| -<h3>Setting email footers</h3> |
| +<h3 id='settingemailfooters'>Setting email footers</h3> |
| <p>It is possible to set email footers in each email sent via the Web UI. |
| This is done by configuring the <code>email_footer</code> variable in <code>site/api/lib/config.lua</code>. |
| You may use the following variables in the footer:</p> |
| @@ -204,7 +204,7 @@ You may use the following variables in the footer:</p> |
| -------- |
| </pre> |
| |
| -<h3>A note on email headers</h3> |
| +<h3 id='anoteonemailheaders'>A note on email headers</h3> |
| <p>By default, headers such as to/cc are not shown in the normal email view. |
| To enable these headers, set <code>full_headers</code> to <code>true</code> in the <code>site/api/lib/config.lua</code> file.</p> |
| <h4><a id="disclaimer"></a>Disclaimer</h4> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/downloads.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/downloads.html b/content/downloads.html |
| index d49fe90..a725c61 100644 |
| --- a/content/downloads.html |
| +++ b/content/downloads.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Download Pony Mail</h1> |
| +<h1 id='downloadponymail'>Download Pony Mail</h1> |
| <p>While we do not have any official Apache releases yet, you may check out |
| previous non-Apache releases on our GitHub repo, at |
| <a href="https://github.com/apache/incubator-ponymail/releases">https://github.com/apache/incubator-ponymail/releases</a>.</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/index.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/index.html b/content/index.html |
| index 1096636..9b4676a 100644 |
| --- a/content/index.html |
| +++ b/content/index.html |
| @@ -47,7 +47,7 @@ using Mozilla Persona or OAuth2 (Google, GitHub, Facebook etc) for authenticatio |
| <p>Pony Mail works in both public, private and mixed-mode, allowing you |
| to have one unified place for all your communication, both public and |
| private.</p> |
| -<h3>Features include:</h3> |
| +<h3 id='featuresinclude'>Features include:</h3> |
| <ul> |
| <li>Importing from standard mbox files, maildir directory, Pipermail or an mod_mbox-driven site</li> |
| <li>Public and private list viewing based on auth</li> |
| @@ -66,7 +66,7 @@ private.</p> |
| <li>Source view and custom range mbox export</li> |
| <li>Customized trend analysis and n-grams</li> |
| </ul> |
| -<h3>Requirements:</h3> |
| +<h3 id='requirements'>Requirements:</h3> |
| <ul> |
| <li>Linux operating system (tested on Ubuntu, Debian, Fedora and CentOS - Windows or OS/X may work)</li> |
| <li>ElasticSearch backend</li> |
| @@ -78,14 +78,14 @@ private.</p> |
| <li>OR any mailing list system of your choice (use archiver plugin with stdin)</li> |
| <li>Lua >=5.1 + lua-cjson, luasec and luasocket</li> |
| </ul> |
| -<h3>Development Benchmarking</h3> |
| +<h3 id='developmentbenchmarking'>Development Benchmarking</h3> |
| <p>Pony Mail has been built for and tested with the mail archives of the Apache |
| Software Foundation, which span more than 15 million emails sent across more |
| than 20 years. To put things into perspective, importing all this on a modern |
| machine (2xSSD with 64GB RAM) took around 12 hours and resulted in a performance |
| at around 100 archive search requests per second per ES node, depending on mailing |
| list size and available bandwidth.</p> |
| -<h3>TODO:</h3> |
| +<h3 id='todo'>TODO:</h3> |
| <p>This is a list of what we would love to get done:</p> |
| <ul> |
| <li>Start on documentation (WIP)</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/source.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/source.html b/content/source.html |
| index c263cd1..5f0899a 100644 |
| --- a/content/source.html |
| +++ b/content/source.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Source code</h1> |
| +<h1 id='sourcecode'>Source code</h1> |
| <p>You can check out our canonical source repository at: |
| <a href="https://git-wip-us.apache.org/repos/asf/incubator-ponymail.git">https://git-wip-us.apache.org/repos/asf/incubator-ponymail.git</a></p> |
| <p>We also have a GitHub mirror at: <a href="https://github.com/apache/incubator-ponymail">https://github.com/apache/incubator-ponymail</a></p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/44f3401f/content/support.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/support.html b/content/support.html |
| index 9daee86..238212b 100644 |
| --- a/content/support.html |
| +++ b/content/support.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1>Getting Support</h1> |
| +<h1 id='gettingsupport'>Getting Support</h1> |
| <p>Our primary communication interface is - you guessed it - mailing lists!<br/> |
| We have a number of mailing lists for various purposes:<br/></p> |
| <table border="0"> |
| |
| |
| From commits-return-80-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 04:32:00 2016 |
| Return-Path: <commits-return-80-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 19D53200B36 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 06:32:00 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 1896D160A44; Wed, 1 Jun 2016 04:32:00 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 606B6160A46 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 06:31:59 +0200 (CEST) |
| Received: (qmail 33311 invoked by uid 500); 1 Jun 2016 04:31:58 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 33302 invoked by uid 99); 1 Jun 2016 04:31:58 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:31:58 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 1003DC2435 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 04:31:58 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) |
| with ESMTP id v_TZ1RC9OLa6 for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 04:31:57 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7282C5F2C2 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 04:31:56 +0000 (UTC) |
| Received: (qmail 33242 invoked by uid 99); 1 Jun 2016 04:31:55 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:31:55 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 8987BDFE61; Wed, 1 Jun 2016 04:31:55 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 04:31:55 -0000 |
| Message-Id: <f49613bbfb2e46568307c736017ff9ea@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [1/2] incubator-ponymail git commit: fix up preferences script |
| archived-at: Wed, 01 Jun 2016 04:32:00 -0000 |
| |
| Repository: incubator-ponymail |
| Updated Branches: |
| refs/heads/master 59fd2dd40 -> 42b2a9eb4 |
| |
| |
| fix up preferences script |
| |
| - tweak the null check |
| - reword the email association email |
| This fixes #47 and also addresses #40 |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/b228f12b |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/b228f12b |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/b228f12b |
| |
| Branch: refs/heads/master |
| Commit: b228f12bd25d580b6c639122665e6c17321563a2 |
| Parents: 59fd2dd |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 06:30:24 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 06:30:24 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| site/api/preferences.lua | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b228f12b/site/api/preferences.lua |
| ---------------------------------------------------------------------- |
| diff --git a/site/api/preferences.lua b/site/api/preferences.lua |
| index 3b4c164..80f3c0f 100644 |
| --- a/site/api/preferences.lua |
| +++ b/site/api/preferences.lua |
| @@ -80,13 +80,13 @@ function handle(r) |
| -- send email |
| local source = smtp.message{ |
| headers = { |
| - subject = "Confirm email address merge in Pony Mail", |
| + subject = "Confirm email address association in Pony Mail", |
| to = get.associate, |
| from = ("\"Pony Mail\"<no-reply@%s>"):format(mldom) |
| }, |
| body = ([[ |
| -You (or someone else) has requested to merge this email address with the account '%s' in Pony Mail. |
| -If you wish to complete this merge, please visit %s |
| +You (or someone else) has requested to associate this email address with the account '%s' in Pony Mail. |
| +If you wish to complete this association, please visit %s |
| ...Or don't if you didn't request this, just ignore this email. |
| |
| With regards, |
| @@ -109,7 +109,7 @@ Pony Mail - Email for Ponies and People. |
| if get.verify and get.hash and account and account.credentials.altemail then |
| local verified = false |
| for k, v in pairs(account.credentials.altemail) do |
| - if v and (not v == JSON.null) and v.hash == get.hash then |
| + if v and not (v == JSON.null) and v.hash == get.hash then |
| account.credentials.altemail[k].verified = true |
| verified = true |
| break |
| |
| |
| From commits-return-79-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 04:31:59 2016 |
| Return-Path: <commits-return-79-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id E8CB9200B13 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 06:31:59 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id E77B6160A47; Wed, 1 Jun 2016 04:31:59 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 3CAC7160A44 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 06:31:59 +0200 (CEST) |
| Received: (qmail 33270 invoked by uid 500); 1 Jun 2016 04:31:58 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 33261 invoked by uid 99); 1 Jun 2016 04:31:58 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:31:58 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id E5315180501 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 04:31:57 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) |
| with ESMTP id 0Hvf0kM5hR0z for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 04:31:57 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 7D6B65F36D |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 04:31:56 +0000 (UTC) |
| Received: (qmail 33244 invoked by uid 99); 1 Jun 2016 04:31:55 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 04:31:55 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 91963DFB14; Wed, 1 Jun 2016 04:31:55 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 04:31:56 -0000 |
| Message-Id: <c22202740616473e8f5944429dd485df@git.apache.org> |
| In-Reply-To: <f49613bbfb2e46568307c736017ff9ea@git.apache.org> |
| References: <f49613bbfb2e46568307c736017ff9ea@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [2/2] incubator-ponymail git commit: reword a bit |
| archived-at: Wed, 01 Jun 2016 04:32:00 -0000 |
| |
| reword a bit |
| |
| this should fix #40 |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/42b2a9eb |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/42b2a9eb |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/42b2a9eb |
| |
| Branch: refs/heads/master |
| Commit: 42b2a9eb4e902191dcc4206c2efba688dd997090 |
| Parents: b228f12 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 06:31:33 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 06:31:33 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| site/js/alts.js | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/42b2a9eb/site/js/alts.js |
| ---------------------------------------------------------------------- |
| diff --git a/site/js/alts.js b/site/js/alts.js |
| index af4ba82..82412b2 100644 |
| --- a/site/js/alts.js |
| +++ b/site/js/alts.js |
| @@ -52,7 +52,7 @@ function listAlts() { |
| } |
| |
| function newAlt(addr) { |
| - GetAsync("/api/preferences.lua?associate=" + addr, null, function() { alert("Your association request has been handled. Please check your inbox! Depending on grey-listing etc, it may take up to 15 minutes before your confirmation email arrives.")}) |
| + GetAsync("/api/preferences.lua?associate=" + addr, null, function() { alert("An association request has been sent to the specified email address. Please check your inbox! Depending on grey-listing etc, it may take up to 15 minutes before your confirmation email arrives.")}) |
| return false; |
| } |
| |
| |
| |
| From commits-return-81-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 05:58:13 2016 |
| Return-Path: <commits-return-81-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 9B714200B13 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 07:58:13 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 9A607160A47; Wed, 1 Jun 2016 05:58:13 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id E00AC160A41 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 07:58:12 +0200 (CEST) |
| Received: (qmail 82390 invoked by uid 500); 1 Jun 2016 05:58:12 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 82372 invoked by uid 99); 1 Jun 2016 05:58:12 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 05:58:12 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B811418059B |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 05:58:11 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) |
| with ESMTP id wEnb-Q61U3HI for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 05:58:09 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id D030C5F39C |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 05:58:08 +0000 (UTC) |
| Received: (qmail 82335 invoked by uid 99); 1 Jun 2016 05:58:07 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 05:58:07 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id C0415DFB74; Wed, 1 Jun 2016 05:58:07 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Message-Id: <39ba302b73c54c85b9eeed2e1d7adc49@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: incubator-ponymail git commit: ponymail.js is needed for popup() |
| Date: Wed, 1 Jun 2016 05:58:07 +0000 (UTC) |
| archived-at: Wed, 01 Jun 2016 05:58:13 -0000 |
| |
| Repository: incubator-ponymail |
| Updated Branches: |
| refs/heads/master 42b2a9eb4 -> c68e32c80 |
| |
| |
| ponymail.js is needed for popup() |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/c68e32c8 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/c68e32c8 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/c68e32c8 |
| |
| Branch: refs/heads/master |
| Commit: c68e32c80cf71c891628090355a0bf645ddb9d01 |
| Parents: 42b2a9e |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 07:57:42 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 07:57:42 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| site/oauth.html | 1 + |
| 1 file changed, 1 insertion(+) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/c68e32c8/site/oauth.html |
| ---------------------------------------------------------------------- |
| diff --git a/site/oauth.html b/site/oauth.html |
| index 315f42a..2358a2a 100644 |
| --- a/site/oauth.html |
| +++ b/site/oauth.html |
| @@ -41,6 +41,7 @@ |
| <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
| <!-- Include all compiled plugins (below), or include individual files as needed --> |
| <script src="js/bootstrap.min.js"></script> |
| + <script src="js/ponymail.js"></script> |
| <script src="js/oauth.js"></script> |
| <script src="js/config.js"></script> |
| <script src="https://login.persona.org/include.js"></script> |
| |
| |
| From commits-return-82-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 06:20:34 2016 |
| Return-Path: <commits-return-82-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id B7CD6200B13 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 08:20:34 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id B6747160A47; Wed, 1 Jun 2016 06:20:34 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 071F91602C5 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 08:20:33 +0200 (CEST) |
| Received: (qmail 15486 invoked by uid 500); 1 Jun 2016 06:20:33 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 15477 invoked by uid 99); 1 Jun 2016 06:20:33 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:20:33 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id AA4A2C130C |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 06:20:32 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) |
| with ESMTP id lP34o1yoTbhO for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 06:20:30 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id E4EFB5FB17 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 06:20:29 +0000 (UTC) |
| Received: (qmail 15461 invoked by uid 99); 1 Jun 2016 06:20:29 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:20:29 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id D3769DFB74; Wed, 1 Jun 2016 06:20:28 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 06:20:28 -0000 |
| Message-Id: <0c02aa52c47d4a958b7abe2bf296f428@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [1/2] incubator-ponymail-site git commit: add a pilcrow next to |
| headers with a link |
| archived-at: Wed, 01 Jun 2016 06:20:34 -0000 |
| |
| Repository: incubator-ponymail-site |
| Updated Branches: |
| refs/heads/asf-site 44f3401f0 -> f1948e07a |
| |
| |
| add a pilcrow next to headers with a link |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/5f2e46c5 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/5f2e46c5 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/5f2e46c5 |
| |
| Branch: refs/heads/asf-site |
| Commit: 5f2e46c528cd5ed3fee163720bcc23331382ffdd |
| Parents: 44f3401 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 08:19:54 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 08:19:54 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| content/css/default.css | 4 +++- |
| source/generate.py | 4 +++- |
| 2 files changed, 6 insertions(+), 2 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/5f2e46c5/content/css/default.css |
| ---------------------------------------------------------------------- |
| diff --git a/content/css/default.css b/content/css/default.css |
| index 998ae5f..e455d1e 100644 |
| --- a/content/css/default.css |
| +++ b/content/css/default.css |
| @@ -4500,7 +4500,9 @@ img { |
| width: 100% |
| } |
| } |
| - |
| +h1:hover a, h2:hover a, h3:hover a, h4:hover a, h5:hover a, h6:hover a { |
| + color: rgba(70,70,50,1) !important; |
| +} |
| #menubar { |
| font-size: 20pt; |
| background: #4e413a; |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/5f2e46c5/source/generate.py |
| ---------------------------------------------------------------------- |
| diff --git a/source/generate.py b/source/generate.py |
| index 4de9c47..a8b097b 100644 |
| --- a/source/generate.py |
| +++ b/source/generate.py |
| @@ -23,10 +23,12 @@ def runDir(path): |
| text = re.sub(r"([A-Z/]+)\.md", lambda x: x.group(1).lower() + ".html", text, flags =re.MULTILINE) |
| html = markdown.markdown(text) |
| # Convert h1-h6 into links |
| - html = re.sub(r"<h([1-6])>(.+?)</h[1-6]>", lambda x: "<h%s id='%s'>%s</h%s>" % ( |
| + html = re.sub(r"<h([1-6])>(.+?)</h[1-6]>", lambda x: |
| + "<h%s id='%s'>%s<a href='#%s' style='color: rgba(0,0,0,0);'>¶</a></h%s>" % ( |
| x.group(1), |
| re.sub(r"[^a-z0-9]+", "", x.group(2).lower()), |
| x.group(2), |
| + re.sub(r"[^a-z0-9]+", "", x.group(2).lower()), |
| x.group(1) |
| ) |
| , html) |
| |
| |
| From commits-return-83-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 06:20:38 2016 |
| Return-Path: <commits-return-83-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id E4740200B13 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 08:20:38 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id E31CE160A47; Wed, 1 Jun 2016 06:20:38 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 41D8A1602C5 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 08:20:37 +0200 (CEST) |
| Received: (qmail 15529 invoked by uid 500); 1 Jun 2016 06:20:36 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 15520 invoked by uid 99); 1 Jun 2016 06:20:36 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:20:36 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D8C2EC2459 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 06:20:35 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -3.896 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-3.896 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_INFOUSMEBIZ=0.75, |
| KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, |
| RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) |
| with ESMTP id oJQghqJ8RjSl for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 06:20:32 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id CCD9C5FAF2 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 06:20:29 +0000 (UTC) |
| Received: (qmail 15458 invoked by uid 99); 1 Jun 2016 06:20:29 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:20:29 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id D6C7EDFE61; Wed, 1 Jun 2016 06:20:28 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 06:20:29 -0000 |
| Message-Id: <f3c42a94edd24f388bab20c6e7b8123d@git.apache.org> |
| In-Reply-To: <0c02aa52c47d4a958b7abe2bf296f428@git.apache.org> |
| References: <0c02aa52c47d4a958b7abe2bf296f428@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [2/2] incubator-ponymail-site git commit: regen |
| archived-at: Wed, 01 Jun 2016 06:20:39 -0000 |
| |
| regen |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/f1948e07 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/f1948e07 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/f1948e07 |
| |
| Branch: refs/heads/asf-site |
| Commit: f1948e07a054604d79f9088530604a219725cc9e |
| Parents: 5f2e46c |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 08:20:17 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 08:20:17 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| content/about.html | 8 ++++---- |
| content/contribute.html | 10 +++++----- |
| content/docs.html | 6 +++--- |
| content/docs/api.html | 10 +++++----- |
| content/docs/archiving.html | 22 +++++++++++----------- |
| content/docs/building.html | 4 ++-- |
| content/docs/contributing.html | 8 ++++---- |
| content/docs/importing.html | 20 ++++++++++---------- |
| content/docs/install.centos.html | 2 +- |
| content/docs/install.debian.html | 2 +- |
| content/docs/install.fedora.html | 2 +- |
| content/docs/install.ubuntu.html | 2 +- |
| content/docs/installing.html | 34 +++++++++++++++++----------------- |
| content/downloads.html | 2 +- |
| content/index.html | 8 ++++---- |
| content/source.html | 2 +- |
| content/support.html | 2 +- |
| 17 files changed, 72 insertions(+), 72 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/about.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/about.html b/content/about.html |
| index 15c5dd3..63f49c1 100644 |
| --- a/content/about.html |
| +++ b/content/about.html |
| @@ -33,8 +33,8 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='aboutponymailanditscontributors'>About Pony Mail and its Contributors</h1> |
| -<h3 id='background'>Background</h3> |
| +<h1 id='aboutponymailanditscontributors'>About Pony Mail and its Contributors<a href='#aboutponymailanditscontributors' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| +<h3 id='background'>Background<a href='#background' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Pony Mail began as a response to two things; the lack of diversity in |
| mailing list archives that are less bureaucratic all-or-nothing and more |
| fluid way to interact with mailing lists than what is typically offered, |
| @@ -54,7 +54,7 @@ are?) and then try to get them into your mail client (which never works) |
| and then reply to it. Which will break threading, because you did |
| something wrong. Then you tear out your hair. PONY MAIL TO THE RESCUE!!! |
| (sound of hoof beats)</q></p> |
| -<h3 id='rationale'>Rationale</h3> |
| +<h3 id='rationale'>Rationale<a href='#rationale' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>One of the oft-heard complaints about Apache's development model is that |
| mailing lists are an old person's tool, and web-based communication - |
| forums - are the way to go in the 21st Century. Providing a |
| @@ -72,7 +72,7 @@ through hoops to join a mailing list conversation drives away a lot of |
| people (at least, anecdotally, it does) and if we can remove that |
| barrier I think we'll have an easier time of drawing a new generation |
| into our projects.</p> |
| -<h3 id='whoarewe'>Who are we?</h3> |
| +<h3 id='whoarewe'>Who are we?<a href='#whoarewe' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>We're a small bunch of people committed to making mailing list interaction as easy as possible.<br/> |
| Currently, we consist of (in alphabetical order):<br/> |
| <ul> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/contribute.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/contribute.html b/content/contribute.html |
| index 86dc70a..1d46955 100644 |
| --- a/content/contribute.html |
| +++ b/content/contribute.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='contributingtoponymail'>Contributing to Pony Mail</h1> |
| +<h1 id='contributingtoponymail'>Contributing to Pony Mail<a href='#contributingtoponymail' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>We'd LOVE if more people would contribute to Pony Mail! |
| Any form of contribution is most welcome, whether it be programming, |
| documentation, evangelism, marketing, or helping out other users.</p> |
| @@ -55,9 +55,9 @@ documentation, evangelism, marketing, or helping out other users.</p> |
| <li>Let us know what you want to do, and we'll add you to our contributors list!</li> |
| <li>Join us on #ponymail on the Freenode IRC network</li> |
| </ul> |
| -<h2 id='gitworkflow'>Git Workflow</h2> |
| +<h2 id='gitworkflow'>Git Workflow<a href='#gitworkflow' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>The following workflow is adapted from the <a href="https://cwiki.apache.org/confluence/display/JCLOUDS/Git+workflow">jClouds workflow</a>:</p> |
| -<h4 id='prepareyourfork'>Prepare your fork</h4> |
| +<h4 id='prepareyourfork'>Prepare your fork<a href='#prepareyourfork' style='color: rgba(0,0,0,0);'>¶</a></h4> |
| <p>The first thing to do is to make sure you have the ponymail Git |
| repository configured as a remote. In this case we will add it as a |
| remote called "ponymail": |
| @@ -65,7 +65,7 @@ remote called "ponymail": |
| cd ponymail |
| git remote add ponymail https://git-wip-us.apache.org/repos/asf/incubator-ponymail.git |
| </pre></p> |
| -<h4 id='createthefeaturebranch'>Create the feature branch</h4> |
| +<h4 id='createthefeaturebranch'>Create the feature branch<a href='#createthefeaturebranch' style='color: rgba(0,0,0,0);'>¶</a></h4> |
| <p>When beginning working on the feature, take a branch from the latest master version: |
| <pre> |
| git checkout master |
| @@ -102,7 +102,7 @@ git push <your-fork's-remote> feature-branch -f # You might need to push w |
| </pre></p> |
| <p>Now the pull request will be clean with one single commit and up to date |
| with the latest master. Ready to be merged!</p> |
| -<h4 id='anoteaboutkeepingthepullrequestuptodate'>A note about keeping the pull request up to date</h4> |
| +<h4 id='anoteaboutkeepingthepullrequestuptodate'>A note about keeping the pull request up to date<a href='#anoteaboutkeepingthepullrequestuptodate' style='color: rgba(0,0,0,0);'>¶</a></h4> |
| <p>The key point is to <em>avoid</em> updating your feature branch with master |
| until the PR is ready to be merged (or until you're asked to rebase). |
| This way you'll avoid accidental merge commits and fixing conflicts when |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs.html b/content/docs.html |
| index 1a80f7c..736f23d 100644 |
| --- a/content/docs.html |
| +++ b/content/docs.html |
| @@ -33,9 +33,9 @@ |
| </ul> |
| </div> |
| </div> |
| -<h3 id='gettingstarted'>Getting started</h3> |
| +<h3 id='gettingstarted'>Getting started<a href='#gettingstarted' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>(Optionally see the <a href="/docs/installing.html">detailed installation instructions</a> for more information)</p> |
| -<h4 id='supportedlinuxdistributions'>Supported Linux Distributions</h4> |
| +<h4 id='supportedlinuxdistributions'>Supported Linux Distributions<a href='#supportedlinuxdistributions' style='color: rgba(0,0,0,0);'>¶</a></h4> |
| <p>For a quick guide to installing Pony Mail, please see the guides for:</p> |
| <ul> |
| <li><a href="/docs/install.debian.html">Debian (Jessie) Installation Instructions</a></li> |
| @@ -43,7 +43,7 @@ |
| <li><a href="/docs/install.centos.html">CentOS (7.1) Installation Instructions</a></li> |
| <li><a href="/docs/install.fedora.html">Fedora (22) Installation Instructions</a></li> |
| </ul> |
| -<h4 id='genericinstallationinstructions'>Generic installation instructions</h4> |
| +<h4 id='genericinstallationinstructions'>Generic installation instructions<a href='#genericinstallationinstructions' style='color: rgba(0,0,0,0);'>¶</a></h4> |
| <ol> |
| <li>Install Apache httpd + mod_lua and the lua libs (see http://modlua.org/gs/installing if need be)</li> |
| <li>Install ElasticSearch</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/api.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/api.html b/content/docs/api.html |
| index 1dbb228..151b6c5 100644 |
| --- a/content/docs/api.html |
| +++ b/content/docs/api.html |
| @@ -33,8 +33,8 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='ponymailarchiveapi'>Pony Mail Archive API</h1> |
| -<h3 id='fetchingaspecificemail'>Fetching a specific email:</h3> |
| +<h1 id='ponymailarchiveapi'>Pony Mail Archive API<a href='#ponymailarchiveapi' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| +<h3 id='fetchingaspecificemail'>Fetching a specific email:<a href='#fetchingaspecificemail' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Usage: |
| <code>GET /api/email.lua?id=$mid</code></p> |
| <p>Parameters: (cookie may be required) |
| @@ -64,7 +64,7 @@ |
| } |
| </pre> |
| |
| -<h3 id='fetchinglistdata'>Fetching list data</h3> |
| +<h3 id='fetchinglistdata'>Fetching list data<a href='#fetchinglistdata' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Usage: |
| <code>GET /api/stats.lua?list=$list&domain=$domain[&d=$timespan][&q=$query][&header_from=$from][&header_subject=$subject]</code></p> |
| <p>Parameters: |
| @@ -99,7 +99,7 @@ |
| } |
| </pre> |
| |
| -<h3 id='fetchingpreferencesandquicklistoverview'>Fetching preferences and quick list overview</h3> |
| +<h3 id='fetchingpreferencesandquicklistoverview'>Fetching preferences and quick list overview<a href='#fetchingpreferencesandquicklistoverview' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Usage: |
| <code>GET /api/preferences.lua[?logout=true]</code></p> |
| <p>Parameters: (cookie required) |
| @@ -137,7 +137,7 @@ |
| } |
| </pre> |
| |
| -<h3 id='fetchingnotificationsforaloggedinuser'>Fetching notifications for a logged in user</h3> |
| +<h3 id='fetchingnotificationsforaloggedinuser'>Fetching notifications for a logged in user<a href='#fetchingnotificationsforaloggedinuser' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Usage: |
| <code>GET /api/notifications.lua</code></p> |
| <p>Parameters: <code>None</code> (cookie required)</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/archiving.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/archiving.html b/content/docs/archiving.html |
| index d3756cc..8c8fea3 100644 |
| --- a/content/docs/archiving.html |
| +++ b/content/docs/archiving.html |
| @@ -33,24 +33,24 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='archivingnewemailstoponymail'>Archiving New Emails to Pony Mail</h1> |
| +<h1 id='archivingnewemailstoponymail'>Archiving New Emails to Pony Mail<a href='#archivingnewemailstoponymail' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>This document exists to extend the <a href="installing.html">general install guide</a> provide examples on how to archive emails.</p> |
| <p><strong>Note:</strong> If you plan on <a href="importing.html">importing old emails from an archive</a>, |
| please set up the archiver <strong>first</strong> so as to create an overlap of new emails |
| coming in and old emails being imported. The system is designed to handle this |
| without creating duplicate entries in the archive.</p> |
| -<h2 id='mailman2xexample'>Mailman 2.x example:</h2> |
| +<h2 id='mailman2xexample'>Mailman 2.x example:<a href='#mailman2xexample' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>Set up a Pony Mail mail account/alias on a machine. This can be your local mail |
| server, it can be the machine that Pony Mail is on (install sendmail or postfix |
| etc there), or it can be any other machine with access to the ElasticSearch |
| database that Pony Mail uses.</p> |
| -<h3 id='prerequisites'>Pre-requisites</h3> |
| +<h3 id='prerequisites'>Pre-requisites<a href='#prerequisites' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>If this is not the machine Pony Mail was installed on, you'll need to copy the |
| tools/ directory from your Pony Mail installation to this machine and adjust |
| ponymail.cfg to point to the right place for the database. You will also need |
| Python 3 and the helper libraries installed |
| (<code>pip3 install elasticsearch formatflowed netaddr</code>)</p> |
| -<h3 id='createanalias'>Create an alias:</h3> |
| +<h3 id='createanalias'>Create an alias:<a href='#createanalias' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Set up a mail alias for public and private lists in <code>/etc/aliases</code> or similar method, |
| and point them at the archiver script in tools/:</p> |
| <pre> |
| @@ -60,13 +60,13 @@ foo-private: "|/usr/bin/python3 /path/to/tools/archiver.py --private" |
| </pre> |
| |
| <p>Once done, run <code>newaliases</code> to update your alias DB.</p> |
| -<h3 id='subscribethealiasestoyourmailinglists'>Subscribe the aliases to your mailing lists</h3> |
| +<h3 id='subscribethealiasestoyourmailinglists'>Subscribe the aliases to your mailing lists<a href='#subscribethealiasestoyourmailinglists' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Use the mailman UI or CLI to subscribe foo-public@ to your public lists and |
| foo-private to your private lists. Don't worry, the contents of private lists |
| are hidden by default till the correct AAA scripting is set up.</p> |
| -<h2 id='ezmlmexample'>ezmlm example:</h2> |
| +<h2 id='ezmlmexample'>ezmlm example:<a href='#ezmlmexample' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>First, see the general introduction in the MM2 example, as this applies here as well.</p> |
| -<h3 id='createanalias'>Create an alias:</h3> |
| +<h3 id='createanalias'>Create an alias:<a href='#createanalias' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Set up a dot-forward file for a public and a private alias:</p> |
| <pre> |
| .qmail-archive-public: |
| @@ -76,11 +76,11 @@ are hidden by default till the correct AAA scripting is set up.</p> |
| "|/usr/bin/python3 /path/to/tools/archiver.py --private" |
| </pre> |
| |
| -<h3 id='subscribethealiasestoyourmailinglists'>Subscribe the aliases to your mailing lists</h3> |
| +<h3 id='subscribethealiasestoyourmailinglists'>Subscribe the aliases to your mailing lists<a href='#subscribethealiasestoyourmailinglists' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Use the ezmlm CLI to subscribe your new aliases to the lists: |
| <code>ezmlm-sub foolist/ archive-public@yourhost.tld</code> |
| <code>ezmlm-sub secretlist/ archive-private@yourhost.tld</code></p> |
| -<h2 id='settingupaaa'>Setting up AAA</h2> |
| +<h2 id='settingupaaa'>Setting up AAA<a href='#settingupaaa' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>If you have an custom OAuth2 provider and a binary approach to private access |
| (either/or), you can enable private access to people by having a key/value pair |
| called <code>isMember</code> set to <code>true</code> in your JSON response from the OAuth server, |
| @@ -88,11 +88,11 @@ provided it is set as an authority in config.lua. This will provide anyone |
| defined as a member via OAuth full access to all private lists.</p> |
| <p>If you use LDAP, you can modify the LDAP queries in the example AAA file to suit |
| your organization.</p> |
| -<h2 id='importingarchivinghtmlonlyemails'>Importing/Archiving HTML-only emails</h2> |
| +<h2 id='importingarchivinghtmlonlyemails'>Importing/Archiving HTML-only emails<a href='#importingarchivinghtmlonlyemails' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>Should you need to import HTML-only emails into the archive, you may enable this |
| with the <code>--html2text</code> command line arg. This requires that the <code>html2text</code> Python3 package |
| is installed beforehand.</p> |
| -<h2 id='munginglistids'>Munging list IDs</h2> |
| +<h2 id='munginglistids'>Munging list IDs<a href='#munginglistids' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>If you need to rewrite list IDs on the fly as emails come in, you can use the debug.cropout |
| setting for this (in <code>ponymail.cfg</code>). </p> |
| <p>You can either use it to just crop away something: |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/building.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/building.html b/content/docs/building.html |
| index 1f70a07..16fbcf6 100644 |
| --- a/content/docs/building.html |
| +++ b/content/docs/building.html |
| @@ -33,12 +33,12 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='buildingponymailforproduction'>Building Pony Mail for Production</h1> |
| +<h1 id='buildingponymailforproduction'>Building Pony Mail for Production<a href='#buildingponymailforproduction' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>Most of Pony Mail is ready-for-deployment files that just need to be checked out |
| in order to work. Some areas, such as the JavaScript needs to be combined by a script, |
| as they have been split into several smaller files to make it easier to find and |
| work on various elements of the rendering process.</p> |
| -<h3 id='buildingthejavascriptchunks'>Building the JavaScript chunks</h3> |
| +<h3 id='buildingthejavascriptchunks'>Building the JavaScript chunks<a href='#buildingthejavascriptchunks' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>All JavaScript edits should be done to the <code>site/js/dev/*.js</code> files. |
| Once done, you should run combine.sh in the <code>site/js/dev</code> directory |
| to generate ponymail.js from the scripts in the dev dir:</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/contributing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/contributing.html b/content/docs/contributing.html |
| index 269d388..fad5a41 100644 |
| --- a/content/docs/contributing.html |
| +++ b/content/docs/contributing.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='contributingtoponymail'>Contributing to Pony Mail</h1> |
| +<h1 id='contributingtoponymail'>Contributing to Pony Mail<a href='#contributingtoponymail' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>We'd LOVE it if more people would contribute to Pony Mail! |
| Any form of contribution is most welcome, whether it be programming, |
| documentation, evangelism, marketing, or helping out other users.</p> |
| @@ -41,10 +41,10 @@ documentation, evangelism, marketing, or helping out other users.</p> |
| are always on the lookout for user experiences. If you have used |
| Pony Mail and have feedback or ideas you wish to share, please let |
| us know either through an issue/PR here or on the mailing list.</p> |
| -<h2 id='code'>Code</h2> |
| +<h2 id='code'>Code<a href='#code' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>The Pony Mail code is on GitHub at https://github.com/apache/incubator-ponymail |
| and pull requests are welcome.</p> |
| -<h2 id='mailinglists'>Mailing lists</h2> |
| +<h2 id='mailinglists'>Mailing lists<a href='#mailinglists' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>Developers list: |
| - list: dev@ponymail.incubator.apache.org |
| - subscribe addr: dev-subscribe@ponymail.incubator.apache.org |
| @@ -53,7 +53,7 @@ and pull requests are welcome.</p> |
| - list: issues@ponymail.incubator.apache.org |
| - subscribe addr: issues-subscribe@ponymail.incubator.apache.org |
| - Online version: http://lists.apache.org/list.html?bugs@ponymail.incubator.apache.org</p> |
| -<h2 id='chat'>Chat</h2> |
| +<h2 id='chat'>Chat<a href='#chat' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>IRC: |
| - #ponymail on Freenode</p> |
| <h4><a id="disclaimer"></a>Disclaimer</h4> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/importing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/importing.html b/content/docs/importing.html |
| index 3e10431..88eab9c 100644 |
| --- a/content/docs/importing.html |
| +++ b/content/docs/importing.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='importingdatatoponymail'>Importing Data to Pony Mail</h1> |
| +<h1 id='importingdatatoponymail'>Importing Data to Pony Mail<a href='#importingdatatoponymail' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>Pony Mail supports many ways of importing your old mail archives via the |
| <code>import-mbox.py</code> script. For command line argument tips, run <code>python3 |
| import-mbox.py --help</code>.</p> |
| @@ -42,37 +42,37 @@ import from the same source multiple times without creating duplicate emails in |
| the archive. Both the archiver and the importer use the same digest method, so |
| they can overlap. Usually, you'll want to set up the archiver first, and when |
| emails start flowing through it, you'll use the importer to import older emails.</p> |
| -<h2 id='importingattachments'>Importing attachments</h2> |
| +<h2 id='importingattachments'>Importing attachments<a href='#importingattachments' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>If you wish to import attached files, add the <code>--attachments</code> flag to your import command, otherwise, attachments will be stripped.</p> |
| -<h2 id='importingfrommodmbox'>Importing from mod_mbox</h2> |
| -<h3 id='importingasingledomain'>Importing a single domain</h3> |
| +<h2 id='importingfrommodmbox'>Importing from mod_mbox<a href='#importingfrommodmbox' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| +<h3 id='importingasingledomain'>Importing a single domain<a href='#importingasingledomain' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Provided you have the main mod_mbox page at https://your.tld/mod_mbox/ and your (sub)domain resources at |
| https://your.tld/mod_mbox/$list-yourdomain/, you can import all lists from that domain using:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox --project yourdomain</code></p> |
| <p>For a quick update, which only imports the last 2 months of mail, append then <code>--quick</code> flag.</p> |
| <p>You can also import just a single list by specifying that list ID:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox --project listname-yourdomain</code></p> |
| -<h3 id='importinganentirearchivemultipledomains'>Importing an entire archive (multiple domains)</h3> |
| +<h3 id='importinganentirearchivemultipledomains'>Importing an entire archive (multiple domains)<a href='#importinganentirearchivemultipledomains' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>To import an entire site, use the same command as above, but omit the <code>--project</code> flag</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox</code></p> |
| -<h3 id='settingthedomainorlistidproperlyincaseofvariance'>Setting the domain or list id properly in case of variance</h3> |
| +<h3 id='settingthedomainorlistidproperlyincaseofvariance'>Setting the domain or list id properly in case of variance<a href='#settingthedomainorlistidproperlyincaseofvariance' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>If your old archive varies in terms of list IDs across time, you can force harmonization by using the <code>--lid</code> or <code>--domain</code> flags:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/mod_mbox/ --mod-mbox --project listid-yourdomain --lid "<listid.youdomain.tld>"</code></p> |
| <p>This should only be done one list at a time.</p> |
| -<h2 id='importingfrompipermail'>Importing from Pipermail</h2> |
| +<h2 id='importingfrompipermail'>Importing from Pipermail<a href='#importingfrompipermail' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>To import from pipermail, you will have to run the import one list at a time. As with mod_mbox imports, you must specify a source, but use <code>--pipermail</code> instead of <code>--mod-mbox</code>:</p> |
| <p><code>python3 import-mbox.py --source https://your.tld/pipermail/foolist/ --pipermail</code></p> |
| -<h3 id='pipermailandhtmlonlyemails'>Pipermail and html-only emails</h3> |
| +<h3 id='pipermailandhtmlonlyemails'>Pipermail and html-only emails<a href='#pipermailandhtmlonlyemails' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>While you can convert HTML-only emails to text using <code>--html2text</code>, Pipermail has some peculiarities |
| where it adds a text/plain message to these emails, thus preventing html2text from working. You can |
| circumvent this by using the <code>--ignorebody "foo"</code> arg to ignore all text/plain bodies containing <code>foo</code>.</p> |
| <p>While the <code>project</code> flag is not needed here, you may wish to specify the list ID for the import.</p> |
| -<h2 id='importingfromlocallystoredmboxfiles'>Importing from locally stored mbox files</h2> |
| +<h2 id='importingfromlocallystoredmboxfiles'>Importing from locally stored mbox files<a href='#importingfromlocallystoredmboxfiles' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>To import from one or more local mbox files, specify a filesystem path as the source:</p> |
| <p><code>python3 import-mbox.py --source /tmp/mylists/ --attachments</code></p> |
| <p>If you have a mix of mbox and non-mbox files in the specific dir, you may wish to let Pony Mail know which files to scan:</p> |
| <p><code>python3 import-mbox.py --source /tmp/mylists/ --ext .mbox --attachments</code></p> |
| -<h2 id='testarchives'>Test archives</h2> |
| +<h2 id='testarchives'>Test archives<a href='#testarchives' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>We have a few test archives for those that wish to test large imports. |
| They can be found in gzip format at <a href="http://ponymail.info/mboxes/">http://ponymail.info/mboxes/</a></p> |
| <h4><a id="disclaimer"></a>Disclaimer</h4> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/install.centos.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.centos.html b/content/docs/install.centos.html |
| index 80fb221..507090f 100644 |
| --- a/content/docs/install.centos.html |
| +++ b/content/docs/install.centos.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='installingponymailoncentos71'>Installing Pony Mail on CentOS 7.1:</h1> |
| +<h1 id='installingponymailoncentos71'>Installing Pony Mail on CentOS 7.1:<a href='#installingponymailoncentos71' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>This installation is a bit trickier, as CentOS does not have |
| Python 3 or any of the lua modules in its default package system.</p> |
| <p>Start by installing the following CentOS packages:</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/install.debian.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.debian.html b/content/docs/install.debian.html |
| index 68129af..08a8036 100644 |
| --- a/content/docs/install.debian.html |
| +++ b/content/docs/install.debian.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='installingponymailondebianjessie'>Installing Pony Mail on Debian Jessie:</h1> |
| +<h1 id='installingponymailondebianjessie'>Installing Pony Mail on Debian Jessie:<a href='#installingponymailondebianjessie' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>Start by installing the following Debian packages:</p> |
| <ul> |
| <li>apache2</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/install.fedora.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.fedora.html b/content/docs/install.fedora.html |
| index 07260de..338b6dc 100644 |
| --- a/content/docs/install.fedora.html |
| +++ b/content/docs/install.fedora.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='installingponymailonfedora22'>Installing Pony Mail on Fedora 22:</h1> |
| +<h1 id='installingponymailonfedora22'>Installing Pony Mail on Fedora 22:<a href='#installingponymailonfedora22' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>Start by installing the following Fedora packages:</p> |
| <ul> |
| <li>httpd</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/install.ubuntu.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.ubuntu.html b/content/docs/install.ubuntu.html |
| index 455e1e6..7a062e4 100644 |
| --- a/content/docs/install.ubuntu.html |
| +++ b/content/docs/install.ubuntu.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='installingponymailonubuntu1404or1604'>Installing Pony Mail on Ubuntu 14.04 or 16.04:</h1> |
| +<h1 id='installingponymailonubuntu1404or1604'>Installing Pony Mail on Ubuntu 14.04 or 16.04:<a href='#installingponymailonubuntu1404or1604' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>Start by installing the following Ubuntu packages:</p> |
| <ul> |
| <li>apache2</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/docs/installing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/installing.html b/content/docs/installing.html |
| index bfb390a..a851969 100644 |
| --- a/content/docs/installing.html |
| +++ b/content/docs/installing.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='installingponymail'>Installing Pony Mail</h1> |
| +<h1 id='installingponymail'>Installing Pony Mail<a href='#installingponymail' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>If your distro is on this list, please refer to that specific document |
| for detailed package installation instructions:</p> |
| <ul> |
| @@ -43,7 +43,7 @@ for detailed package installation instructions:</p> |
| <li><a href="install.fedora.html">Fedora (22) Installation Instructions</a></li> |
| </ul> |
| <p>Otherwise, read the next two chapters:</p> |
| -<h2 id='prerequisites'>Pre-requisites</h2> |
| +<h2 id='prerequisites'>Pre-requisites<a href='#prerequisites' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>You will need the following software installed on your machine:</p> |
| <ul> |
| <li>ElasticSearch >= 1.3 (2.0 should also work just fine)</li> |
| @@ -51,7 +51,7 @@ for detailed package installation instructions:</p> |
| <li>Apache HTTP Server 2.4.x with mod_lua (see http://modlua.org/gs/installing if you need to build mod_lua manually)</li> |
| <li>Lua >=5.1 with the following modules: cjson, luasec, luasocket</li> |
| </ul> |
| -<h2 id='downloadandinstall'>Download and Install</h2> |
| +<h2 id='downloadandinstall'>Download and Install<a href='#downloadandinstall' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <ul> |
| <li>Download the git repo: <code>git clone https://github.com/apache/incubator-ponymail.git</code></li> |
| <li>Start ElasticSearch on the machine it needs to run on.</li> |
| @@ -61,7 +61,7 @@ for detailed package installation instructions:</p> |
| ...[follow instructions in the setup script]</code></li> |
| <li>Edit <code>site/js/config.js</code> to suit your needs (usually very little editing is needed)</li> |
| </ul> |
| -<h3 id='usingauthforelasticsearch'>Using auth for ElasticSearch</h3> |
| +<h3 id='usingauthforelasticsearch'>Using auth for ElasticSearch<a href='#usingauthforelasticsearch' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>If your ElasticSearch instance requires authentication for the importer/archiver, please |
| add the following lines in the <code>elasticsearch</code> block of <code>ponymail.cfg</code> once generated:</p> |
| <pre> |
| @@ -69,20 +69,20 @@ user: [username for ES] |
| password: [password for ES] |
| </pre> |
| |
| -<h3 id='usingapachehttpserver'>Using Apache HTTP Server:</h3> |
| +<h3 id='usingapachehttpserver'>Using Apache HTTP Server:<a href='#usingapachehttpserver' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <ul> |
| <li>Set up a VirtualHost block in Apache httpd that points to the <code>site/</code> directory in Pony Mail</li> |
| <li>Add the configuration snippets from <code>configs/ponymail_httpd.conf</code> to the virtual host</li> |
| <li>Start Apache httpd to enable the user-facing interface</li> |
| </ul> |
| -<h3 id='usingnginx'>Using nginx:</h3> |
| +<h3 id='usingnginx'>Using nginx:<a href='#usingnginx' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <ul> |
| <li>To use nginx, you will also need to install the <code>lua-apr</code> module from your distro.</li> |
| <li>Set up a Server block in nginx that points to the <code>site/</code> directory in Pony Mail</li> |
| <li>Add the configuration snippets from <code>configs/ponymail_nginx.conf</code> to the server config</li> |
| <li>Start nginx to enable the user-facing interface</li> |
| </ul> |
| -<h2 id='settingupthearchiver'>Setting up the archiver</h2> |
| +<h2 id='settingupthearchiver'>Setting up the archiver<a href='#settingupthearchiver' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>First off, you will need both <code>tools/archiver.py</code> and the generated |
| <code>tools/ponymail.cfg</code> present on the machine that your mail server runs on. This |
| machine should also have access to the ElasticSearch backend.</p> |
| @@ -105,30 +105,30 @@ header determines the list ID using the --altheader argument, for instance: |
| enable: yes</code></p> |
| <p>For older mailing list systems such as Mailman 2 and ezmlm, you can also |
| tak a look at our <a href="archiving.html">archiving examples</a> page for pointers.</p> |
| -<h2 id='publicversusprivatelists'>Public versus private lists</h2> |
| +<h2 id='publicversusprivatelists'>Public versus private lists<a href='#publicversusprivatelists' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>In MailMan 3, this should be auto-detected and is not a concern. |
| When using other ML systems via piping to STDIN, you should add |
| the --private arg to the python script to mark an email as private: |
| <code>foolist-private: "|/usr/bin/python3 /path/to/tools/archiver.py --private" |
| foolist-public: "|/usr/bin/python3 /path/to/tools/archiver.py"</code></p> |
| -<h2 id='importingolddataintoponymail'>Importing old data into Pony Mail</h2> |
| +<h2 id='importingolddataintoponymail'>Importing old data into Pony Mail<a href='#importingolddataintoponymail' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>See <a href="importing.html">this guide</a> for details on how to import old archives into Pony Mail.</p> |
| -<h2 id='bulkeditinglists'>Bulk editing lists</h2> |
| +<h2 id='bulkeditinglists'>Bulk editing lists<a href='#bulkeditinglists' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>You can use <code>edit-list.py</code> to perform bulk operations: |
| - Rename lists |
| - Mark entire lists are private or public</p> |
| <p>Run <code>python3 edit-list.py --help</code> for CLI args.</p> |
| -<h2 id='settingupoauthforponymail'>Setting up OAuth for Pony Mail</h2> |
| +<h2 id='settingupoauthforponymail'>Setting up OAuth for Pony Mail<a href='#settingupoauthforponymail' style='color: rgba(0,0,0,0);'>¶</a></h2> |
| <p>If you want people to be able to log in and reply via the Web UI, you can either |
| use the default Persona login (works for all email addresses) or specify an |
| OAuth provider.</p> |
| -<h3 id='settingupordisablingpersona'>Setting up or disabling Persona</h3> |
| +<h3 id='settingupordisablingpersona'>Setting up or disabling Persona<a href='#settingupordisablingpersona' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Persona is enabled by default, as it's a fast and convenient way to enable |
| logins for <em>public</em> lists. Should you wish to disable Persona, set the |
| <code>enabled</code> variable to <code>false</code> in the persona section of <code>site/js/config.js</code>. |
| Persona will only ever work for public lists. For private lists, you will need |
| to specify and implement an OAuth provider.</p> |
| -<h3 id='settingupanoauthprovider'>Setting up an OAuth provider</h3> |
| +<h3 id='settingupanoauthprovider'>Setting up an OAuth provider<a href='#settingupanoauthprovider' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Pony Mail comes with a few default OAuth examples in <code>site/js/config.js</code>, such |
| as ASF Oauth and Google OAuth. You can enable these by uncommenting the lines in |
| question, or set up your own OAuth portal to handle things. This is a standard |
| @@ -159,7 +159,7 @@ config.lua:</p> |
| <p>If not specified in config.lua, OAuth will only provide users with a place to |
| store settings and notifications, and - provided your mail server is set to accept |
| this - a place to reply to emails in the archive.</p> |
| -<h4 id='usinggithuboauthandotherclientsecretproviders'>Using GitHub OAuth and other client-secret providers</h4> |
| +<h4 id='usinggithuboauthandotherclientsecretproviders'>Using GitHub OAuth and other client-secret providers<a href='#usinggithuboauthandotherclientsecretproviders' style='color: rgba(0,0,0,0);'>¶</a></h4> |
| <p>If your OAuth provider requires a client secret, you can specify this in <code>site/api/lib/config.lua</code>, as this GitHub example shows:</p> |
| <pre> |
| oauth_fields = { |
| @@ -172,7 +172,7 @@ this - a place to reply to emails in the archive.</p> |
| </pre> |
| |
| <p>This essentially overrides <code>config.js</code> but without showing the data to anyone outside the server.</p> |
| -<h3 id='whitelistingrepliesviathewebui'>Whitelisting replies via the Web UI</h3> |
| +<h3 id='whitelistingrepliesviathewebui'>Whitelisting replies via the Web UI<a href='#whitelistingrepliesviathewebui' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>To have Pony Mail accept replies done via the Web UI, you must make sure |
| that <code>site/api/lib/config.lua</code> contains the appropriate string (or array of strings) matching the domain(s) you wish to allow new email for. To allow replies to everything, set this to <code>*</code>(NOT RECOMMENDED). |
| You can also allow based on GLOBs or an array of accepted domains and sub-domains:</p> |
| @@ -183,7 +183,7 @@ You can also allow based on GLOBs or an array of accepted domains and sub-domain |
| accepted_domains = { "foo.org", "*.foo.org" } -- Allow posts both to *.foo.org and foo.org |
| </pre> |
| |
| -<h3 id='settingemailfooters'>Setting email footers</h3> |
| +<h3 id='settingemailfooters'>Setting email footers<a href='#settingemailfooters' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>It is possible to set email footers in each email sent via the Web UI. |
| This is done by configuring the <code>email_footer</code> variable in <code>site/api/lib/config.lua</code>. |
| You may use the following variables in the footer:</p> |
| @@ -204,7 +204,7 @@ You may use the following variables in the footer:</p> |
| -------- |
| </pre> |
| |
| -<h3 id='anoteonemailheaders'>A note on email headers</h3> |
| +<h3 id='anoteonemailheaders'>A note on email headers<a href='#anoteonemailheaders' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>By default, headers such as to/cc are not shown in the normal email view. |
| To enable these headers, set <code>full_headers</code> to <code>true</code> in the <code>site/api/lib/config.lua</code> file.</p> |
| <h4><a id="disclaimer"></a>Disclaimer</h4> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/downloads.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/downloads.html b/content/downloads.html |
| index a725c61..d49685a 100644 |
| --- a/content/downloads.html |
| +++ b/content/downloads.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='downloadponymail'>Download Pony Mail</h1> |
| +<h1 id='downloadponymail'>Download Pony Mail<a href='#downloadponymail' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>While we do not have any official Apache releases yet, you may check out |
| previous non-Apache releases on our GitHub repo, at |
| <a href="https://github.com/apache/incubator-ponymail/releases">https://github.com/apache/incubator-ponymail/releases</a>.</p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/index.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/index.html b/content/index.html |
| index 9b4676a..31d065c 100644 |
| --- a/content/index.html |
| +++ b/content/index.html |
| @@ -47,7 +47,7 @@ using Mozilla Persona or OAuth2 (Google, GitHub, Facebook etc) for authenticatio |
| <p>Pony Mail works in both public, private and mixed-mode, allowing you |
| to have one unified place for all your communication, both public and |
| private.</p> |
| -<h3 id='featuresinclude'>Features include:</h3> |
| +<h3 id='featuresinclude'>Features include:<a href='#featuresinclude' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <ul> |
| <li>Importing from standard mbox files, maildir directory, Pipermail or an mod_mbox-driven site</li> |
| <li>Public and private list viewing based on auth</li> |
| @@ -66,7 +66,7 @@ private.</p> |
| <li>Source view and custom range mbox export</li> |
| <li>Customized trend analysis and n-grams</li> |
| </ul> |
| -<h3 id='requirements'>Requirements:</h3> |
| +<h3 id='requirements'>Requirements:<a href='#requirements' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <ul> |
| <li>Linux operating system (tested on Ubuntu, Debian, Fedora and CentOS - Windows or OS/X may work)</li> |
| <li>ElasticSearch backend</li> |
| @@ -78,14 +78,14 @@ private.</p> |
| <li>OR any mailing list system of your choice (use archiver plugin with stdin)</li> |
| <li>Lua >=5.1 + lua-cjson, luasec and luasocket</li> |
| </ul> |
| -<h3 id='developmentbenchmarking'>Development Benchmarking</h3> |
| +<h3 id='developmentbenchmarking'>Development Benchmarking<a href='#developmentbenchmarking' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>Pony Mail has been built for and tested with the mail archives of the Apache |
| Software Foundation, which span more than 15 million emails sent across more |
| than 20 years. To put things into perspective, importing all this on a modern |
| machine (2xSSD with 64GB RAM) took around 12 hours and resulted in a performance |
| at around 100 archive search requests per second per ES node, depending on mailing |
| list size and available bandwidth.</p> |
| -<h3 id='todo'>TODO:</h3> |
| +<h3 id='todo'>TODO:<a href='#todo' style='color: rgba(0,0,0,0);'>¶</a></h3> |
| <p>This is a list of what we would love to get done:</p> |
| <ul> |
| <li>Start on documentation (WIP)</li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/source.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/source.html b/content/source.html |
| index 5f0899a..69d3511 100644 |
| --- a/content/source.html |
| +++ b/content/source.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='sourcecode'>Source code</h1> |
| +<h1 id='sourcecode'>Source code<a href='#sourcecode' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>You can check out our canonical source repository at: |
| <a href="https://git-wip-us.apache.org/repos/asf/incubator-ponymail.git">https://git-wip-us.apache.org/repos/asf/incubator-ponymail.git</a></p> |
| <p>We also have a GitHub mirror at: <a href="https://github.com/apache/incubator-ponymail">https://github.com/apache/incubator-ponymail</a></p> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/f1948e07/content/support.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/support.html b/content/support.html |
| index 238212b..057a679 100644 |
| --- a/content/support.html |
| +++ b/content/support.html |
| @@ -33,7 +33,7 @@ |
| </ul> |
| </div> |
| </div> |
| -<h1 id='gettingsupport'>Getting Support</h1> |
| +<h1 id='gettingsupport'>Getting Support<a href='#gettingsupport' style='color: rgba(0,0,0,0);'>¶</a></h1> |
| <p>Our primary communication interface is - you guessed it - mailing lists!<br/> |
| We have a number of mailing lists for various purposes:<br/></p> |
| <table border="0"> |
| |
| |
| |
| From commits-return-84-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 06:44:05 2016 |
| Return-Path: <commits-return-84-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 40200200B22 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 08:44:05 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 3EAE2160A3A; Wed, 1 Jun 2016 06:44:05 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 85BA4160A1B |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 08:44:04 +0200 (CEST) |
| Received: (qmail 56859 invoked by uid 500); 1 Jun 2016 06:44:03 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 56849 invoked by uid 99); 1 Jun 2016 06:44:03 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:44:03 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 3840AC0D08 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 06:44:03 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx2-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) |
| with ESMTP id RGKlM316PprU for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 06:44:01 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 879285FAC3 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 06:44:00 +0000 (UTC) |
| Received: (qmail 56750 invoked by uid 99); 1 Jun 2016 06:43:59 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:43:59 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 9190FEAC8D; Wed, 1 Jun 2016 06:43:59 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Message-Id: <5ac04d6a106545efb59558a44189f8f6@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: incubator-ponymail git commit: refactor anonymization |
| Date: Wed, 1 Jun 2016 06:43:59 +0000 (UTC) |
| archived-at: Wed, 01 Jun 2016 06:44:05 -0000 |
| |
| Repository: incubator-ponymail |
| Updated Branches: |
| refs/heads/master c68e32c80 -> c20eb984e |
| |
| |
| refactor anonymization |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/c20eb984 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/c20eb984 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/c20eb984 |
| |
| Branch: refs/heads/master |
| Commit: c20eb984eb75b4bd2c67c4e88e0ffddcee35f016 |
| Parents: c68e32c |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 08:43:41 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 08:43:41 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| site/api/thread.lua | 18 ++++++++++++++++-- |
| 1 file changed, 16 insertions(+), 2 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/c20eb984/site/api/thread.lua |
| ---------------------------------------------------------------------- |
| diff --git a/site/api/thread.lua b/site/api/thread.lua |
| index 77883be..9d474bf 100644 |
| --- a/site/api/thread.lua |
| +++ b/site/api/thread.lua |
| @@ -27,6 +27,20 @@ local config = require 'lib/config' |
| |
| local emls_thrd |
| |
| +-- anonymizer func |
| +function anonymize(doc) |
| + if doc.from and #doc.from > 0 then |
| + doc.from = doc.from:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + end |
| + if doc.cc and #doc.cc > 0 then |
| + doc.cc = doc.cc:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + end |
| + if doc.to and #doc.to > 0 then |
| + doc.to = doc.to:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + end |
| + return doc |
| +end |
| + |
| -- func that fetches all children of an original topic email thingy |
| function fetchChildren(r, pdoc, c, biglist, rights, account) |
| c = (c or 0) + 1 |
| @@ -58,7 +72,7 @@ function fetchChildren(r, pdoc, c, biglist, rights, account) |
| biglist[doc['message-id']] = true |
| local mykids = fetchChildren(r, doc, c, biglist, rights, account) |
| if not account and config.antispam then |
| - doc.from = doc.from:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + doc = anonymize(doc) |
| end |
| local dc = { |
| tid = doc.mid, |
| @@ -152,7 +166,7 @@ function handle(r) |
| end |
| if canAccess and doc and doc.mid then |
| if not account and config.antispam then |
| - doc.from = doc.from:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + doc = anonymize(doc) |
| end |
| table.insert(emls_thrd, doc) |
| doc.children = fetchChildren(r, doc, 1, nil, rights, account) |
| |
| |
| From commits-return-85-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 06:47:31 2016 |
| Return-Path: <commits-return-85-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id F202C200B22 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 08:47:31 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id F0CF1160A46; Wed, 1 Jun 2016 06:47:31 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 45B78160A11 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 08:47:31 +0200 (CEST) |
| Received: (qmail 59507 invoked by uid 500); 1 Jun 2016 06:47:30 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 59497 invoked by uid 99); 1 Jun 2016 06:47:30 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:47:30 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id E7E09180542 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 06:47:29 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) |
| with ESMTP id G0wu6L4Wjd81 for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 06:47:28 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 2117C5F296 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 06:47:26 +0000 (UTC) |
| Received: (qmail 59490 invoked by uid 99); 1 Jun 2016 06:47:26 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:47:26 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id D61F1E9675; Wed, 1 Jun 2016 06:47:25 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Message-Id: <0ed453b35c114e93a1c29da870d2e991@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: incubator-ponymail git commit: also anonymize here |
| Date: Wed, 1 Jun 2016 06:47:25 +0000 (UTC) |
| archived-at: Wed, 01 Jun 2016 06:47:32 -0000 |
| |
| Repository: incubator-ponymail |
| Updated Branches: |
| refs/heads/master c20eb984e -> 622d5a173 |
| |
| |
| also anonymize here |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/622d5a17 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/622d5a17 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/622d5a17 |
| |
| Branch: refs/heads/master |
| Commit: 622d5a173a7d62b53b2ff939bc45d2100c3695ac |
| Parents: c20eb98 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 08:47:09 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 08:47:09 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| site/api/email.lua | 16 +++++++++++++++- |
| 1 file changed, 15 insertions(+), 1 deletion(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/622d5a17/site/api/email.lua |
| ---------------------------------------------------------------------- |
| diff --git a/site/api/email.lua b/site/api/email.lua |
| index c28c6c7..429eae8 100644 |
| --- a/site/api/email.lua |
| +++ b/site/api/email.lua |
| @@ -24,6 +24,20 @@ local user = require 'lib/user' |
| local cross = require 'lib/cross' |
| local config = require 'lib/config' |
| |
| +-- anonymizer func |
| +function anonymize(doc) |
| + if doc.from and #doc.from > 0 then |
| + doc.from = doc.from:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + end |
| + if doc.cc and #doc.cc > 0 then |
| + doc.cc = doc.cc:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + end |
| + if doc.to and #doc.to > 0 then |
| + doc.to = doc.to:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + end |
| + return doc |
| +end |
| + |
| function handle(r) |
| r.content_type = "application/json" |
| local get = r:parseargs() |
| @@ -112,7 +126,7 @@ function handle(r) |
| eml = "unknown" |
| end |
| if not account then -- anonymize email address if not logged in |
| - doc.from = doc.from:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| + doc = anonymize(doc) |
| if doc.from_raw then |
| doc.from_raw = doc.from_raw:gsub("(%S+)@(%S+)", function(a,b) return a:sub(1,2) .. "..." .. "@" .. b end) |
| end |
| |
| |
| From commits-return-86-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 06:59:45 2016 |
| Return-Path: <commits-return-86-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 84044200B22 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 08:59:45 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 82E45160A46; Wed, 1 Jun 2016 06:59:45 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id C9224160A45 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 08:59:44 +0200 (CEST) |
| Received: (qmail 83750 invoked by uid 500); 1 Jun 2016 06:59:44 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 83741 invoked by uid 99); 1 Jun 2016 06:59:44 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:59:44 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id A29B9CB60B |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 06:59:43 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) |
| with ESMTP id adPDGuYgIYqb for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 06:59:41 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id E2D9B5F4E3 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 06:59:40 +0000 (UTC) |
| Received: (qmail 83737 invoked by uid 99); 1 Jun 2016 06:59:40 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 06:59:40 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 182F8E0498; Wed, 1 Jun 2016 06:59:40 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Message-Id: <93b258f269864e90b1225683d999da51@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: incubator-ponymail git commit: default to not showing to/cc for |
| anonymous people |
| Date: Wed, 1 Jun 2016 06:59:40 +0000 (UTC) |
| archived-at: Wed, 01 Jun 2016 06:59:45 -0000 |
| |
| Repository: incubator-ponymail |
| Updated Branches: |
| refs/heads/master 622d5a173 -> 3acd303a4 |
| |
| |
| default to not showing to/cc for anonymous people |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/3acd303a |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/3acd303a |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/3acd303a |
| |
| Branch: refs/heads/master |
| Commit: 3acd303a406f131090f94ea6e2062d9d16e320e4 |
| Parents: 622d5a1 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 08:59:25 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 08:59:25 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| site/api/email.lua | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/3acd303a/site/api/email.lua |
| ---------------------------------------------------------------------- |
| diff --git a/site/api/email.lua b/site/api/email.lua |
| index 429eae8..920219e 100644 |
| --- a/site/api/email.lua |
| +++ b/site/api/email.lua |
| @@ -139,7 +139,7 @@ function handle(r) |
| |
| |
| -- Anonymize to/cc if full_headers is false |
| - if not config.full_headers then |
| + if not config.full_headers or not account then |
| doc.to = nil |
| doc.cc = nil |
| end |
| |
| |
| From commits-return-87-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 08:27:55 2016 |
| Return-Path: <commits-return-87-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id C0CF6200B22 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 10:27:55 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id BF57D160A46; Wed, 1 Jun 2016 08:27:55 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 1398D160A41 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 10:27:54 +0200 (CEST) |
| Received: (qmail 40926 invoked by uid 500); 1 Jun 2016 08:27:49 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 40912 invoked by uid 99); 1 Jun 2016 08:27:49 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 08:27:49 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DB024180B10 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 08:27:48 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-us.apache.org ([10.40.0.8]) |
| by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) |
| with ESMTP id LOaIngQNMOJA for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 08:27:48 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id DA4575F39A |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 08:27:47 +0000 (UTC) |
| Received: (qmail 40436 invoked by uid 99); 1 Jun 2016 08:27:47 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 08:27:47 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 00FE5E0498; Wed, 1 Jun 2016 08:27:47 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Message-Id: <e4ca0e48493d48f785e035f5989a6ee0@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: incubator-ponymail-site git commit: widen site a bit |
| Date: Wed, 1 Jun 2016 08:27:47 +0000 (UTC) |
| archived-at: Wed, 01 Jun 2016 08:27:55 -0000 |
| |
| Repository: incubator-ponymail-site |
| Updated Branches: |
| refs/heads/asf-site f1948e07a -> 96dcc2a43 |
| |
| |
| widen site a bit |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/96dcc2a4 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/96dcc2a4 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/96dcc2a4 |
| |
| Branch: refs/heads/asf-site |
| Commit: 96dcc2a43ea7dfe2dfe8caa35fcfc5951d517330 |
| Parents: f1948e0 |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 10:27:29 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 10:27:29 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| content/css/default.css | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/96dcc2a4/content/css/default.css |
| ---------------------------------------------------------------------- |
| diff --git a/content/css/default.css b/content/css/default.css |
| index e455d1e..e5e623e 100644 |
| --- a/content/css/default.css |
| +++ b/content/css/default.css |
| @@ -1286,7 +1286,7 @@ html { |
| |
| body { |
| background: #eae2dc; |
| - max-width: 900px; |
| + max-width: 1000px; |
| margin: 0px auto; |
| padding: 10px; |
| border-left: 4px solid #666; |
| |
| |
| From commits-return-88-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 09:52:52 2016 |
| Return-Path: <commits-return-88-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 92964200B22 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 11:52:52 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 9121E160A46; Wed, 1 Jun 2016 09:52:52 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 64EDE160A41 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 11:52:51 +0200 (CEST) |
| Received: (qmail 96173 invoked by uid 500); 1 Jun 2016 09:52:50 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 96164 invoked by uid 99); 1 Jun 2016 09:52:50 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 09:52:50 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 3786A1A06D4 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 09:52:50 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx2-lw-us.apache.org ([10.40.0.8]) |
| by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) |
| with ESMTP id DTP0ce9dtf0T for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 09:52:47 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 4A64E5F247 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 09:52:46 +0000 (UTC) |
| Received: (qmail 96158 invoked by uid 99); 1 Jun 2016 09:52:45 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 09:52:45 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id 82852E0498; Wed, 1 Jun 2016 09:52:45 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Message-Id: <1a21ee51e7b04579942a4fbcb1986ae6@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: incubator-ponymail-site git commit: color tweak for title |
| Date: Wed, 1 Jun 2016 09:52:45 +0000 (UTC) |
| archived-at: Wed, 01 Jun 2016 09:52:52 -0000 |
| |
| Repository: incubator-ponymail-site |
| Updated Branches: |
| refs/heads/asf-site 96dcc2a43 -> 33856f66b |
| |
| |
| color tweak for title |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/33856f66 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/33856f66 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/33856f66 |
| |
| Branch: refs/heads/asf-site |
| Commit: 33856f66b6bdb5cb4a638fa1afa0f9dcb4b29d94 |
| Parents: 96dcc2a |
| Author: humbedooh <humbedooh@apache.org> |
| Authored: Wed Jun 1 11:52:33 2016 +0200 |
| Committer: humbedooh <humbedooh@apache.org> |
| Committed: Wed Jun 1 11:52:33 2016 +0200 |
| |
| ---------------------------------------------------------------------- |
| content/about.html | 2 +- |
| content/contribute.html | 2 +- |
| content/docs.html | 2 +- |
| content/docs/api.html | 2 +- |
| content/docs/archiving.html | 2 +- |
| content/docs/building.html | 2 +- |
| content/docs/contributing.html | 2 +- |
| content/docs/importing.html | 2 +- |
| content/docs/install.centos.html | 2 +- |
| content/docs/install.debian.html | 2 +- |
| content/docs/install.fedora.html | 2 +- |
| content/docs/install.ubuntu.html | 2 +- |
| content/docs/installing.html | 2 +- |
| content/downloads.html | 2 +- |
| content/index.html | 2 +- |
| content/source.html | 2 +- |
| content/support.html | 2 +- |
| source/template.html | 2 +- |
| 18 files changed, 18 insertions(+), 18 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/about.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/about.html b/content/about.html |
| index 63f49c1..662e01e 100644 |
| --- a/content/about.html |
| +++ b/content/about.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/contribute.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/contribute.html b/content/contribute.html |
| index 1d46955..2236c67 100644 |
| --- a/content/contribute.html |
| +++ b/content/contribute.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs.html b/content/docs.html |
| index 736f23d..ed0b36f 100644 |
| --- a/content/docs.html |
| +++ b/content/docs.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/api.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/api.html b/content/docs/api.html |
| index 151b6c5..868e36a 100644 |
| --- a/content/docs/api.html |
| +++ b/content/docs/api.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/archiving.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/archiving.html b/content/docs/archiving.html |
| index 8c8fea3..3bb759b 100644 |
| --- a/content/docs/archiving.html |
| +++ b/content/docs/archiving.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/building.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/building.html b/content/docs/building.html |
| index 16fbcf6..933bf36 100644 |
| --- a/content/docs/building.html |
| +++ b/content/docs/building.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/contributing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/contributing.html b/content/docs/contributing.html |
| index fad5a41..cf17328 100644 |
| --- a/content/docs/contributing.html |
| +++ b/content/docs/contributing.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/importing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/importing.html b/content/docs/importing.html |
| index 88eab9c..9132487 100644 |
| --- a/content/docs/importing.html |
| +++ b/content/docs/importing.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/install.centos.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.centos.html b/content/docs/install.centos.html |
| index 507090f..403d741 100644 |
| --- a/content/docs/install.centos.html |
| +++ b/content/docs/install.centos.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/install.debian.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.debian.html b/content/docs/install.debian.html |
| index 08a8036..37029fb 100644 |
| --- a/content/docs/install.debian.html |
| +++ b/content/docs/install.debian.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/install.fedora.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.fedora.html b/content/docs/install.fedora.html |
| index 338b6dc..857d0d1 100644 |
| --- a/content/docs/install.fedora.html |
| +++ b/content/docs/install.fedora.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/install.ubuntu.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/install.ubuntu.html b/content/docs/install.ubuntu.html |
| index 7a062e4..19924ca 100644 |
| --- a/content/docs/install.ubuntu.html |
| +++ b/content/docs/install.ubuntu.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/docs/installing.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/docs/installing.html b/content/docs/installing.html |
| index a851969..8132e08 100644 |
| --- a/content/docs/installing.html |
| +++ b/content/docs/installing.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/downloads.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/downloads.html b/content/downloads.html |
| index d49685a..07cb7fa 100644 |
| --- a/content/downloads.html |
| +++ b/content/downloads.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/index.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/index.html b/content/index.html |
| index 31d065c..402f214 100644 |
| --- a/content/index.html |
| +++ b/content/index.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/source.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/source.html b/content/source.html |
| index 69d3511..5dae6e1 100644 |
| --- a/content/source.html |
| +++ b/content/source.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/content/support.html |
| ---------------------------------------------------------------------- |
| diff --git a/content/support.html b/content/support.html |
| index 057a679..8579b92 100644 |
| --- a/content/support.html |
| +++ b/content/support.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/33856f66/source/template.html |
| ---------------------------------------------------------------------- |
| diff --git a/source/template.html b/source/template.html |
| index 7fa3b16..7905568 100644 |
| --- a/source/template.html |
| +++ b/source/template.html |
| @@ -21,7 +21,7 @@ |
| </head><body> |
| <div style="margin: -10px; background: #7e614a; color: #EEE; margin-bottom: 20px; text-align: center;"> |
| <a href="/contribute.html"><img align='left' style="width: 150px; height: 150px; position: relative; left: -4px; border: 0;" src="/images/devme.png" alt="Fork/Download Pony Mail"></a> |
| - <h1><a id="title" href="/" style="color: #FFF;">Apache Pony Mail (Incubating)</a></h1> |
| + <h1><a id="title" href="/" style="color: #FFF !important;">Apache Pony Mail (Incubating)</a></h1> |
| <div id="menubar"> |
| <ul> |
| <li><a href="/docs.html"><i class="fa fa-book"></i><span>Documentation</span></a></li> |
| |
| |
| From commits-return-95-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 12:41:10 2016 |
| Return-Path: <commits-return-95-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 7407C200B24 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 14:41:10 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 72A31160A46; Wed, 1 Jun 2016 12:41:10 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 5E919160A41 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 14:41:09 +0200 (CEST) |
| Received: (qmail 69170 invoked by uid 500); 1 Jun 2016 12:41:08 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 69161 invoked by uid 99); 1 Jun 2016 12:41:08 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:08 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 21E3B1A06F9 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 12:41:08 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.626 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.626 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426, T_FILL_THIS_FORM_FRAUD_PHISH=0.01, |
| T_FILL_THIS_FORM_SHORT=0.01] autolearn=disabled |
| Received: from mx1-lw-eu.apache.org ([10.40.0.8]) |
| by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) |
| with ESMTP id LhRJJlQs4sCJ for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 12:41:06 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id EA8105F4E3 |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 12:41:04 +0000 (UTC) |
| Received: (qmail 68855 invoked by uid 99); 1 Jun 2016 12:41:04 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:04 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id E6BCDE0AD9; Wed, 1 Jun 2016 12:41:03 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 12:41:03 -0000 |
| Message-Id: <3c28b203ad154646be3e45d56a24315f@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [01/11] incubator-ponymail git commit: add a synch ponymail with imap |
| tool |
| archived-at: Wed, 01 Jun 2016 12:41:10 -0000 |
| |
| Repository: incubator-ponymail |
| Updated Branches: |
| refs/heads/master 3acd303a4 -> 43d70910c |
| |
| |
| add a synch ponymail with imap tool |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/cefa48d0 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/cefa48d0 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/cefa48d0 |
| |
| Branch: refs/heads/master |
| Commit: cefa48d0baef7a9cd37c53f9dcbc3e52670c329a |
| Parents: a383086 |
| Author: Sam Ruby <rubys@intertwingly.net> |
| Authored: Tue May 3 14:21:49 2016 -0400 |
| Committer: Sam Ruby <rubys@intertwingly.net> |
| Committed: Tue May 3 14:21:49 2016 -0400 |
| |
| ---------------------------------------------------------------------- |
| tools/archiver.py | 25 +++++-- |
| tools/sync-imap.py | 176 ++++++++++++++++++++++++++++++++++++++++++++++++ |
| 2 files changed, 195 insertions(+), 6 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/cefa48d0/tools/archiver.py |
| ---------------------------------------------------------------------- |
| diff --git a/tools/archiver.py b/tools/archiver.py |
| index ec1fef7..8cdbcbf 100644 |
| --- a/tools/archiver.py |
| +++ b/tools/archiver.py |
| @@ -75,6 +75,7 @@ def parse_attachment(part): |
| dispositions = cd.strip().split(";") |
| if dispositions[0].lower() == "attachment": |
| fd = part.get_payload(decode=True) |
| + if not fd: return None, None |
| attachment = {} |
| attachment['content_type'] = part.get_content_type() |
| attachment['size'] = len(fd) |
| @@ -83,7 +84,8 @@ def parse_attachment(part): |
| b64 = codecs.encode(fd, "base64").decode('ascii', 'ignore') |
| attachment['hash'] = h |
| for param in dispositions[1:]: |
| - key,val = param.split("=") |
| + if not '=' in param: continue |
| + key,val = param.split("=", 1) |
| if key.lower().strip() == "filename": |
| val = val.strip(' "') |
| print("Found attachment: %s" % val) |
| @@ -282,8 +284,9 @@ class Archiver(object): |
| body = body.encode('utf-8') |
| except: |
| body = None |
| - if body: |
| - attachments, contents = self.msgfiles(msg) |
| + |
| + attachments, contents = self.msgfiles(msg) |
| + if body or attachments: |
| private = False |
| if hasattr(mlist, 'archive_public') and mlist.archive_public == True: |
| private = False |
| @@ -293,7 +296,8 @@ class Archiver(object): |
| private = True |
| pmid = mid |
| try: |
| - mid = "%s@%s@%s" % (hashlib.sha224(body if type(body) is bytes else body.encode('ascii', 'ignore')).hexdigest(), uid_mdate, lid) |
| + mid = "%s@%s" % (hashlib.sha224(msg.as_bytes()).hexdigest(), lid) |
| + print(mid) |
| except Exception as err: |
| if logger: |
| logger.warn("Could not generate MID: %s" % err) |
| @@ -475,6 +479,8 @@ if __name__ == '__main__': |
| help='Use the archive timestamp as the email date instead of the Date header') |
| parser.add_argument('--quiet', dest='quiet', action='store_true', |
| help='Do not exit -1 if the email could not be parsed') |
| + parser.add_argument('--verbose', dest='verbose', action='store_true', |
| + help='Output additional log messages') |
| parser.add_argument('--html2text', dest='html2text', action='store_true', |
| help='Try to convert HTML to text if no text/plain message is found') |
| args = parser.parse_args() |
| @@ -482,6 +488,10 @@ if __name__ == '__main__': |
| if args.html2text: |
| import html2text |
| parseHTML = True |
| + |
| + if args.verbose: |
| + import logging |
| + logging.basicConfig(stream=sys.stdout, level=logging.INFO) |
| |
| foo = Archiver() |
| input_stream = io.TextIOWrapper(sys.stdin.buffer, encoding='utf-8', errors="ignore") |
| @@ -512,7 +522,7 @@ if __name__ == '__main__': |
| msg.replace_header('List-ID', msg.get(altheader)) |
| except: |
| msg.add_header('list-id', msg.get(altheader)) |
| - |
| + |
| # Set specific LID? |
| if args.lid and len(args.lid[0]) > 3: |
| try: |
| @@ -562,6 +572,9 @@ if __name__ == '__main__': |
| lid = foo.archive_message(msg_metadata, msg) |
| print("%s: Done archiving to %s!" % (email.utils.formatdate(), lid)) |
| except Exception as err: |
| + if args.verbose: |
| + import traceback |
| + traceback.print_exc() |
| print("Archiving failed!: %s" % err) |
| raise Exception("Archiving to ES failed") |
| else: |
| @@ -572,4 +585,4 @@ if __name__ == '__main__': |
| else: |
| print("Could not parse email: %s" % err) |
| sys.exit(-1) |
| - |
| \ No newline at end of file |
| + |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/cefa48d0/tools/sync-imap.py |
| ---------------------------------------------------------------------- |
| diff --git a/tools/sync-imap.py b/tools/sync-imap.py |
| new file mode 100755 |
| index 0000000..43d457d |
| --- /dev/null |
| +++ b/tools/sync-imap.py |
| @@ -0,0 +1,176 @@ |
| +#!/usr/bin/env python3.4 |
| +# -*- coding: utf-8 -*- |
| +# Licensed to the Apache Software Foundation (ASF) under one or more |
| +# contributor license agreements. See the NOTICE file distributed with |
| +# this work for additional information regarding copyright ownership. |
| +# The ASF licenses this file to You under the Apache License, Version 2.0 |
| +# (the "License"); you may not use this file except in compliance with |
| + #the License. You may obtain a copy of the License at |
| +# |
| +# http://www.apache.org/licenses/LICENSE-2.0 |
| +# |
| +# Unless required by applicable law or agreed to in writing, software |
| +# distributed under the License is distributed on an "AS IS" BASIS, |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| +# See the License for the specific language governing permissions and |
| +# limitations under the License. |
| + |
| +""" Syncronize ponymail with an imap server. |
| + |
| +Fetches message-ids from both ponymail and an imap server, and adds or |
| +deletes whatever is necessary from ponymail to make it match. |
| + |
| +See usage for instructions. |
| + |
| +""" |
| + |
| +import argparse |
| +import configparser |
| +import elasticsearch |
| +import imaplib |
| +import os |
| +import pwd |
| +import subprocess |
| +import sys |
| +import re |
| + |
| +# change working directory to location of this script |
| + |
| +os.chdir(os.path.dirname(os.path.abspath(__file__))) |
| + |
| +# global defaults |
| + |
| +es_list = None |
| +imap_host = 'localhost' |
| +imap_port = 993 |
| +imap_user = pwd.getpwuid(os.getuid()).pw_name |
| +imap_password = None |
| +imap_folder = 'INBOX' |
| +html2text = False |
| +verbose = False |
| + |
| +# fetch config overrides |
| + |
| +config = configparser.RawConfigParser() |
| +config.read('ponymail.cfg') |
| +iname = config.get("elasticsearch", "dbname") |
| +if config.has_option('imap', 'host'): |
| + imap_host = config.get('imap', 'host') |
| +if config.has_option('imap', 'port'): |
| + imap_port = config.getint('imap', 'port') |
| +if config.has_option('imap', 'user'): |
| + imap_user = config.getint('imap', 'user') |
| +if config.has_option('imap', 'password'): |
| + imap_password = config.getint('imap', 'password') |
| + |
| +# fetch command line argument overrides |
| + |
| +parser = argparse.ArgumentParser(description='Command line options.') |
| +parser.add_argument('--list', dest='list', type=str, nargs=1, |
| + help='ElasticSearch list') |
| +parser.add_argument('--host', dest='host', type=str, nargs=1, |
| + help='IMAP host') |
| +parser.add_argument('--port', dest='port', type=int, nargs=1, |
| + help='IMAP port') |
| +parser.add_argument('--user', dest='user', type=str, nargs=1, |
| + help='IMAP user') |
| +parser.add_argument('--password', dest='password', type=str, nargs=1, |
| + help='IMAP password') |
| +parser.add_argument('--folder', dest='folder', type=str, nargs=1, |
| + help='IMAP folder') |
| +parser.add_argument('--html2text', dest='html2text', action='store_true', |
| + help='Try to convert HTML to text if no text/plain message is found') |
| +parser.add_argument('--verbose', dest='verbose', action='store_true', |
| + help='Output additional log messages') |
| + |
| +args = parser.parse_args() |
| + |
| +if args.list: |
| + es_list = args.list[0] |
| +if args.host: |
| + imap_host = args.host[0] |
| +if args.port: |
| + imap_port = args.port[0] |
| +if args.user: |
| + imap_user = args.user[0] |
| +if args.password: |
| + imap_password = args.password[0] |
| +if args.folder: |
| + imap_folder = args.folder[0] |
| +if args.html2text: |
| + html2text = True |
| +if args.verbose: |
| + verbose = True |
| + |
| +if not es_list or not imap_password: |
| + parser.print_help() |
| + sys.exit(-1) |
| + |
| +es_list = "<%s>" % es_list.strip("<>") # We need <> around it! |
| + |
| +# fetch message-id => _id pairs from elasticsearch |
| + |
| +es = elasticsearch.Elasticsearch() |
| +result = es.search(scroll = '5m', |
| + body = { |
| + 'size': 1024, |
| + 'fields': ['message-id'], |
| + 'query': {'match': {'list': es_list}} |
| + } |
| +) |
| + |
| +db = {} |
| +while len(result['hits']['hits']) > 0: |
| + for hit in result['hits']['hits']: |
| + db[hit['fields']['message-id'][0]] = hit['_id'] |
| + result = es.scroll(scroll='5m', scroll_id=result['_scroll_id']) |
| + |
| +# fetch message-id => uid pairs from imap |
| + |
| +imap = imaplib.IMAP4_SSL(imap_host, imap_port) |
| +imap.login(imap_user, imap_password) |
| +imap.select(imap_folder, readonly=True) |
| +results = imap.uid('search', None, 'ALL') |
| +uids = b','.join(results[1][0].split()) |
| +results = imap.uid('fetch', uids, '(BODY[HEADER.FIELDS (MESSAGE-ID)])') |
| + |
| +mail = {} |
| +uid_re = re.compile(b'^\d+ \(UID (\d+) BODY\[') |
| +mid_re = re.compile(b'^Message-ID:\s*(.*?)\s*$', re.I) |
| +uid = None |
| +for result in results[1]: |
| + for line in result: |
| + if isinstance(line, bytes): |
| + match = uid_re.match(line) |
| + if match: |
| + uid = match.group(1) |
| + else: |
| + match = mid_re.match(line) |
| + if match: |
| + try: |
| + mail[match.group(1).decode('utf-8')] = uid |
| + uid = None |
| + except ValueError: |
| + pass |
| + |
| +# delete items from elasticsearch that are not present in imap |
| + |
| +for mid, _id in db.items(): |
| + if not mid in mail: |
| + es.delete(index=iname, id=_id, doc_type='mbox') |
| + es.delete(index=iname, id=_id, doc_type='mbox_source') |
| + print("deleted: " + mid) |
| + |
| +# add new items to elasticsearch from imap |
| + |
| +for mid, uid in mail.items(): |
| + if not mid in db: |
| + argv = [sys.executable, 'archiver.py', '--lid=%s' % es_list] |
| + if verbose: argv.append('--verbose') |
| + if html2text: argv.append('--html2text') |
| + child = subprocess.Popen(argv, stdin=subprocess.PIPE) |
| + child.stdin.write(imap.uid('fetch', uid, '(RFC822)')[1][0][1]) |
| + child.stdin.close() |
| + rc = child.wait() |
| + print("inserted: %s, rc = %d" % (mid, rc)) |
| + |
| |
| |
| From commits-return-90-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 12:41:09 2016 |
| Return-Path: <commits-return-90-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 848E6200B24 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 14:41:09 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 812D0160A4B; Wed, 1 Jun 2016 12:41:09 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 78826160A46 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 14:41:08 +0200 (CEST) |
| Received: (qmail 68962 invoked by uid 500); 1 Jun 2016 12:41:07 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 68922 invoked by uid 99); 1 Jun 2016 12:41:07 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:07 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 4C6CBC0D53 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 12:41:07 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-us.apache.org ([10.40.0.8]) |
| by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) |
| with ESMTP id kcCOmrq4s0pi for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 12:41:05 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id ED5E95FD0E |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 12:41:04 +0000 (UTC) |
| Received: (qmail 68868 invoked by uid 99); 1 Jun 2016 12:41:04 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:04 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id F2841E0B2D; Wed, 1 Jun 2016 12:41:03 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 12:41:04 -0000 |
| Message-Id: <a1346c9fc529448cab2e5e8cd466db3a@git.apache.org> |
| In-Reply-To: <3c28b203ad154646be3e45d56a24315f@git.apache.org> |
| References: <3c28b203ad154646be3e45d56a24315f@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [02/11] incubator-ponymail git commit: start to split out compute |
| updates |
| archived-at: Wed, 01 Jun 2016 12:41:09 -0000 |
| |
| start to split out compute updates |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/9571469a |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/9571469a |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/9571469a |
| |
| Branch: refs/heads/master |
| Commit: 9571469a7bd7cb0c06eded35c232f54ed89e7d37 |
| Parents: cefa48d |
| Author: Sam Ruby <rubys@intertwingly.net> |
| Authored: Wed May 4 07:00:29 2016 -0400 |
| Committer: Sam Ruby <rubys@intertwingly.net> |
| Committed: Wed May 4 07:00:29 2016 -0400 |
| |
| ---------------------------------------------------------------------- |
| tools/archiver.py | 270 ++++++++++++++++++++++++++----------------------- |
| 1 file changed, 145 insertions(+), 125 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/9571469a/tools/archiver.py |
| ---------------------------------------------------------------------- |
| diff --git a/tools/archiver.py b/tools/archiver.py |
| index 8cdbcbf..4ba0c5d 100644 |
| --- a/tools/archiver.py |
| +++ b/tools/archiver.py |
| @@ -214,19 +214,15 @@ class Archiver(object): |
| |
| return body |
| |
| - def archive_message(self, mlist, msg): |
| - """Send the message to the archiver. |
| + def compute_updates(self, lid, private, msg): |
| + """Determine what needs to be sent to the archiver. |
| |
| - :param mlist: The IMailingList object. |
| + :param lid: The list id |
| :param msg: The message object. |
| """ |
| |
| - lid = None |
| - m = re.search(r"(<.+>)", mlist.list_id.replace("@", ".")) |
| - if m: |
| - lid = m.group(1) |
| - else: |
| - lid = "<%s>" % mlist.list_id.strip("<>").replace("@", ".") |
| + ojson = None |
| + |
| if self.cropout: |
| crops = self.cropout.split(" ") |
| # Regex replace? |
| @@ -287,17 +283,9 @@ class Archiver(object): |
| |
| attachments, contents = self.msgfiles(msg) |
| if body or attachments: |
| - private = False |
| - if hasattr(mlist, 'archive_public') and mlist.archive_public == True: |
| - private = False |
| - elif hasattr(mlist, 'archive_public') and mlist.archive_public == False: |
| - private = True |
| - elif hasattr(mlist, 'archive_policy') and mlist.archive_policy is not ArchivePolicy.public: |
| - private = True |
| pmid = mid |
| try: |
| mid = "%s@%s" % (hashlib.sha224(msg.as_bytes()).hexdigest(), lid) |
| - print(mid) |
| except Exception as err: |
| if logger: |
| logger.warn("Could not generate MID: %s" % err) |
| @@ -329,122 +317,154 @@ class Archiver(object): |
| 'body': body.decode('utf-8', 'replace') if type(body) is bytes else body, |
| 'attachments': attachments |
| } |
| + |
| + self.msg_metadata = msg_metadata |
| + self.irt = irt |
| + |
| + return ojson, contents |
| |
| - if contents: |
| - for key in contents: |
| - self.es.index( |
| - index=self.dbname, |
| - doc_type="attachment", |
| - id=key, |
| - body = { |
| - 'source': contents[key] |
| - } |
| - ) |
| + def archive_message(self, mlist, msg): |
| + """Send the message to the archiver. |
| + |
| + :param mlist: The IMailingList object. |
| + :param msg: The message object. |
| + """ |
| + |
| + lid = None |
| + m = re.search(r"(<.+>)", mlist.list_id.replace("@", ".")) |
| + if m: |
| + lid = m.group(1) |
| + else: |
| + lid = "<%s>" % mlist.list_id.strip("<>").replace("@", ".") |
| + |
| + private = False |
| + if hasattr(mlist, 'archive_public') and mlist.archive_public == True: |
| + private = False |
| + elif hasattr(mlist, 'archive_public') and mlist.archive_public == False: |
| + private = True |
| + elif hasattr(mlist, 'archive_policy') and mlist.archive_policy is not ArchivePolicy.public: |
| + private = True |
| + |
| + ojson, contents = self.compute_updates(lid, private, msg) |
| + |
| + msg_metadata = self.msg_metadata |
| + irt = self.irt |
| + |
| + if contents: |
| + for key in contents: |
| + self.es.index( |
| + index=self.dbname, |
| + doc_type="attachment", |
| + id=key, |
| + body = { |
| + 'source': contents[key] |
| + } |
| + ) |
| + |
| + self.es.index( |
| + index=self.dbname, |
| + doc_type="mbox", |
| + id=ojson['mid'], |
| + consistency = self.consistency, |
| + body = ojson |
| + ) |
| |
| + self.es.index( |
| + index=self.dbname, |
| + doc_type="mbox_source", |
| + id=ojson['mid'], |
| + consistency = self.consistency, |
| + body = { |
| + "message-id": msg_metadata['message-id'], |
| + "source": msg.as_string() |
| + } |
| + ) |
| + |
| + # If MailMan and list info is present, save/update it in ES: |
| + if hasattr(mlist, 'description') and hasattr(mlist, 'list_name') and mlist.description and mlist.list_name: |
| self.es.index( |
| index=self.dbname, |
| - doc_type="mbox", |
| - id=mid, |
| - consistency = self.consistency, |
| - body = ojson |
| - ) |
| - |
| - self.es.index( |
| - index=self.dbname, |
| - doc_type="mbox_source", |
| - id=mid, |
| + doc_type="mailinglists", |
| + id=lid, |
| consistency = self.consistency, |
| body = { |
| - "message-id": msg_metadata['message-id'], |
| - "source": msg.as_string() |
| + 'list': lid, |
| + 'name': mlist.list_name, |
| + 'description': mlist.description, |
| + 'private': private |
| } |
| ) |
| - |
| - # If MailMan and list info is present, save/update it in ES: |
| - if hasattr(mlist, 'description') and hasattr(mlist, 'list_name') and mlist.description and mlist.list_name: |
| - self.es.index( |
| - index=self.dbname, |
| - doc_type="mailinglists", |
| - id=lid, |
| - consistency = self.consistency, |
| - body = { |
| - 'list': lid, |
| - 'name': mlist.list_name, |
| - 'description': mlist.description, |
| - 'private': private |
| - } |
| - ) |
| - |
| - if logger: |
| - logger.info("Pony Mail archived message %s successfully" % mid) |
| - oldrefs = [] |
| - |
| - # Is this a direct reply to a pony mail email? |
| - if irt != "": |
| - dm = re.search(r"pony-([a-f0-9]+)-([a-f0-9]+)@", irt) |
| - if dm: |
| - cid = dm.group(1) |
| - mid = dm.group(2) |
| - if self.es.exists(index = self.dbname, doc_type = 'account', id = cid): |
| - doc = self.es.get(index = self.dbname, doc_type = 'account', id = cid) |
| - if doc: |
| - oldrefs.append(cid) |
| - self.es.index( |
| - index=self.dbname, |
| - doc_type="notifications", |
| - consistency = self.consistency, |
| - body = { |
| - 'type': 'direct', |
| - 'recipient': cid, |
| - 'list': lid, |
| - 'private': private, |
| - 'date': msg_metadata['date'], |
| - 'from': msg_metadata['from'], |
| - 'to': msg_metadata['to'], |
| - 'subject': msg_metadata['subject'], |
| - 'message-id': msg_metadata['message-id'], |
| - 'in-reply-to': irt, |
| - 'epoch': email.utils.mktime_tz(mdate), |
| - 'mid': mid, |
| - 'seen': 0 |
| - } |
| - ) |
| - if logger: |
| - logger.info("Notification sent to %s for %s" % (cid, mid)) |
| - |
| - # Are there indirect replies to pony emails? |
| - if msg_metadata.get('references'): |
| - for im in re.finditer(r"pony-([a-f0-9]+)-([a-f0-9]+)@", msg_metadata.get('references')): |
| - cid = im.group(1) |
| - mid = im.group(2) |
| - if self.es.exists(index = self.dbname, doc_type = 'account', id = cid): |
| - doc = self.es.get(index = self.dbname, doc_type = 'account', id = cid) |
| - |
| - # does the user want to be notified of indirect replies? |
| - if doc and 'preferences' in doc['_source'] and doc['_source']['preferences'].get('notifications') == 'indirect' and not cid in oldrefs: |
| - oldrefs.append(cid) |
| - self.es.index( |
| - index=self.dbname, |
| - consistency = self.consistency, |
| - doc_type="notifications", |
| - body = { |
| - 'type': 'indirect', |
| - 'recipient': cid, |
| - 'list': lid, |
| - 'private': private, |
| - 'date': msg_metadata['date'], |
| - 'from': msg_metadata['from'], |
| - 'to': msg_metadata['to'], |
| - 'subject': msg_metadata['subject'], |
| - 'message-id': msg_metadata['message-id'], |
| - 'in-reply-to': mirt, |
| - 'epoch': email.utils.mktime_tz(mdate), |
| - 'mid': mid, |
| - 'seen': 0 |
| - } |
| - ) |
| - if logger: |
| - logger.info("Notification sent to %s for %s" % (cid, mid)) |
| + |
| + if logger: |
| + logger.info("Pony Mail archived message %s successfully" % mid) |
| + oldrefs = [] |
| + |
| + # Is this a direct reply to a pony mail email? |
| + if irt != "": |
| + dm = re.search(r"pony-([a-f0-9]+)-([a-f0-9]+)@", irt) |
| + if dm: |
| + cid = dm.group(1) |
| + mid = dm.group(2) |
| + if self.es.exists(index = self.dbname, doc_type = 'account', id = cid): |
| + doc = self.es.get(index = self.dbname, doc_type = 'account', id = cid) |
| + if doc: |
| + oldrefs.append(cid) |
| + self.es.index( |
| + index=self.dbname, |
| + doc_type="notifications", |
| + consistency = self.consistency, |
| + body = { |
| + 'type': 'direct', |
| + 'recipient': cid, |
| + 'list': lid, |
| + 'private': private, |
| + 'date': msg_metadata['date'], |
| + 'from': msg_metadata['from'], |
| + 'to': msg_metadata['to'], |
| + 'subject': msg_metadata['subject'], |
| + 'message-id': msg_metadata['message-id'], |
| + 'in-reply-to': irt, |
| + 'epoch': email.utils.mktime_tz(mdate), |
| + 'mid': mid, |
| + 'seen': 0 |
| + } |
| + ) |
| + if logger: |
| + logger.info("Notification sent to %s for %s" % (cid, mid)) |
| + |
| + # Are there indirect replies to pony emails? |
| + if msg_metadata.get('references'): |
| + for im in re.finditer(r"pony-([a-f0-9]+)-([a-f0-9]+)@", msg_metadata.get('references')): |
| + cid = im.group(1) |
| + mid = im.group(2) |
| + if self.es.exists(index = self.dbname, doc_type = 'account', id = cid): |
| + doc = self.es.get(index = self.dbname, doc_type = 'account', id = cid) |
| + |
| + # does the user want to be notified of indirect replies? |
| + if doc and 'preferences' in doc['_source'] and doc['_source']['preferences'].get('notifications') == 'indirect' and not cid in oldrefs: |
| + oldrefs.append(cid) |
| + self.es.index( |
| + index=self.dbname, |
| + consistency = self.consistency, |
| + doc_type="notifications", |
| + body = { |
| + 'type': 'indirect', |
| + 'recipient': cid, |
| + 'list': lid, |
| + 'private': private, |
| + 'date': msg_metadata['date'], |
| + 'from': msg_metadata['from'], |
| + 'to': msg_metadata['to'], |
| + 'subject': msg_metadata['subject'], |
| + 'message-id': msg_metadata['message-id'], |
| + 'in-reply-to': mirt, |
| + 'epoch': email.utils.mktime_tz(mdate), |
| + 'mid': mid, |
| + 'seen': 0 |
| + } |
| + ) |
| + if logger: |
| + logger.info("Notification sent to %s for %s" % (cid, mid)) |
| return lid |
| |
| def list_url(self, mlist): |
| |
| |
| From commits-return-89-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 12:41:09 2016 |
| Return-Path: <commits-return-89-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 238C3200B22 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 14:41:09 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 22119160A4E; Wed, 1 Jun 2016 12:41:09 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id 692DD160A41 |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 14:41:08 +0200 (CEST) |
| Received: (qmail 68921 invoked by uid 500); 1 Jun 2016 12:41:07 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 68909 invoked by uid 99); 1 Jun 2016 12:41:07 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:07 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 2685FC0D08 |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 12:41:07 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
| X-Spam-Level: |
| X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 |
| tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, |
| RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, |
| RP_MATCHES_RCVD=-1.426] autolearn=disabled |
| Received: from mx1-lw-us.apache.org ([10.40.0.8]) |
| by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) |
| with ESMTP id b346zOw5JPm3 for <commits@ponymail.apache.org>; |
| Wed, 1 Jun 2016 12:41:05 +0000 (UTC) |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id D4AB85FC9D |
| for <commits@ponymail.incubator.apache.org>; Wed, 1 Jun 2016 12:41:04 +0000 (UTC) |
| Received: (qmail 68857 invoked by uid 99); 1 Jun 2016 12:41:04 -0000 |
| Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:04 +0000 |
| Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) |
| id EF67FE0252; Wed, 1 Jun 2016 12:41:03 +0000 (UTC) |
| Content-Type: text/plain; charset="us-ascii" |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| From: humbedooh@apache.org |
| To: commits@ponymail.incubator.apache.org |
| Date: Wed, 01 Jun 2016 12:41:05 -0000 |
| Message-Id: <77d5bc8bf3284d0f837b3ed8e6766b68@git.apache.org> |
| In-Reply-To: <3c28b203ad154646be3e45d56a24315f@git.apache.org> |
| References: <3c28b203ad154646be3e45d56a24315f@git.apache.org> |
| X-Mailer: ASF-Git Admin Mailer |
| Subject: [03/11] incubator-ponymail git commit: bulk deletes |
| archived-at: Wed, 01 Jun 2016 12:41:09 -0000 |
| |
| bulk deletes |
| |
| |
| Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo |
| Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/6bcb4912 |
| Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/6bcb4912 |
| Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/6bcb4912 |
| |
| Branch: refs/heads/master |
| Commit: 6bcb491206bd0b22218505fc96a80057b6166294 |
| Parents: 9571469 |
| Author: Sam Ruby <rubys@intertwingly.net> |
| Authored: Wed May 4 07:32:14 2016 -0400 |
| Committer: Sam Ruby <rubys@intertwingly.net> |
| Committed: Wed May 4 07:32:14 2016 -0400 |
| |
| ---------------------------------------------------------------------- |
| tools/sync-imap.py | 33 +++++++++++++++++++++++++++------ |
| 1 file changed, 27 insertions(+), 6 deletions(-) |
| ---------------------------------------------------------------------- |
| |
| |
| http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/6bcb4912/tools/sync-imap.py |
| ---------------------------------------------------------------------- |
| diff --git a/tools/sync-imap.py b/tools/sync-imap.py |
| index 43d457d..14d2711 100755 |
| --- a/tools/sync-imap.py |
| +++ b/tools/sync-imap.py |
| @@ -27,6 +27,7 @@ See usage for instructions. |
| import argparse |
| import configparser |
| import elasticsearch |
| +from elasticsearch import helpers as eshelper |
| import imaplib |
| import os |
| import pwd |
| @@ -155,16 +156,37 @@ for result in results[1]: |
| |
| # delete items from elasticsearch that are not present in imap |
| |
| +queue1 = [] |
| +queue2 = [] |
| for mid, _id in db.items(): |
| - if not mid in mail: |
| - es.delete(index=iname, id=_id, doc_type='mbox') |
| - es.delete(index=iname, id=_id, doc_type='mbox_source') |
| - print("deleted: " + mid) |
| + if True: # not mid in mail: |
| + queue1.append({ |
| + '_op_type': 'delete', |
| + '_index': iname, |
| + '_type': 'mbox', |
| + '_id': _id |
| + }) |
| + queue2.append({ |
| + '_op_type': 'delete', |
| + '_index': iname, |
| + '_type': 'mbox_source', |
| + '_id': _id |
| + }) |
| + print("deleting: " + mid) |
| + |
| +while len(queue1) > 0: |
| + eshelper.bulk(es, queue1[0:1024]) |
| + del queue1[0:1024] |
| + |
| +while len(queue2) > 0: |
| + eshelper.bulk(es, queue2[0:1024]) |
| + del queue2[0:1024] |
| |
| # add new items to elasticsearch from imap |
| |
| for mid, uid in mail.items(): |
| if not mid in db: |
| + print("indexing %s" % mid) |
| argv = [sys.executable, 'archiver.py', '--lid=%s' % es_list] |
| if verbose: argv.append('--verbose') |
| if html2text: argv.append('--html2text') |
| @@ -172,5 +194,4 @@ for mid, uid in mail.items(): |
| child.stdin.write(imap.uid('fetch', uid, '(RFC822)')[1][0][1]) |
| child.stdin.close() |
| rc = child.wait() |
| - print("inserted: %s, rc = %d" % (mid, rc)) |
| - |
| + if rc != 0: print("rc %d" % rc) |
| |
| |
| From commits-return-93-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org Wed Jun 01 12:41:09 2016 |
| Return-Path: <commits-return-93-archive-asf-public=cust-asf.ponee.io@ponymail.incubator.apache.org> |
| X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io |
| Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) |
| by cust-asf2.ponee.io (Postfix) with ESMTP id 99D43200B37 |
| for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 1 Jun 2016 14:41:09 +0200 (CEST) |
| Received: by cust-asf.ponee.io (Postfix) |
| id 98807160A4E; Wed, 1 Jun 2016 12:41:09 +0000 (UTC) |
| Delivered-To: archive-asf-public@cust-asf.ponee.io |
| Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) |
| by cust-asf.ponee.io (Postfix) with SMTP id DB4B2160A4C |
| for <archive-asf-public@cust-asf.ponee.io>; Wed, 1 Jun 2016 14:41:08 +0200 (CEST) |
| Received: (qmail 69090 invoked by uid 500); 1 Jun 2016 12:41:08 -0000 |
| Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm |
| Precedence: bulk |
| List-Help: <mailto:commits-help@ponymail.incubator.apache.org> |
| List-Unsubscribe: <mailto:commits-unsubscribe@ponymail.incubator.apache.org> |
| List-Post: <mailto:commits@ponymail.incubator.apache.org> |
| List-Id: <commits.ponymail.incubator.apache.org> |
| Reply-To: dev@ponymail.incubator.apache.org |
| Delivered-To: mailing list commits@ponymail.incubator.apache.org |
| Received: (qmail 69077 invoked by uid 99); 1 Jun 2016 12:41:08 -0000 |
| Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) |
| by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jun 2016 12:41:08 +0000 |
| Received: from localhost (localhost [127.0.0.1]) |
| by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id A9F8B18128A |
| for <commits@ponymail.apache.org>; Wed, 1 Jun 2016 12:41:07 +0000 (UTC) |
| X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org |
| X-Spam-Flag: NO |
| X-Spam-Score: -4.646 |
|
