32 files changed, 63 insertions, 52 deletions

diff --git a/README.md b/README.md
index 1c65b20..c617834 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-# PGPMailman plugin
+# Mailman PGP plugin
 
 A plugin for GNU Mailman that adds encrypted mailing lists via PGP/MIME.
diff --git a/setup.py b/setup.py
index 1b88bd2..abf2af5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages, setup
 
 setup(
-    name='pgpmailman',
+    name='mailman_pgp',
     version='0.1',
     description='A PGP plugin for the GNU Mailman mailing list manager',
     long_description="""\
diff --git a/src/pgpmailman/__init__.py b/src/mailman_pgp/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/__init__.py
+++ b/src/mailman_pgp/__init__.py
diff --git a/src/pgpmailman/archivers/__init__.py b/src/mailman_pgp/archivers/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/archivers/__init__.py
+++ b/src/mailman_pgp/archivers/__init__.py
diff --git a/src/pgpmailman/archivers/local.py b/src/mailman_pgp/archivers/local.py
index 43e08ee..43e08ee 100644
--- a/src/pgpmailman/archivers/local.py
+++ b/src/mailman_pgp/archivers/local.py
diff --git a/src/pgpmailman/archivers/remote.py b/src/mailman_pgp/archivers/remote.py
index 388de3a..388de3a 100644
--- a/src/pgpmailman/archivers/remote.py
+++ b/src/mailman_pgp/archivers/remote.py
diff --git a/src/pgpmailman/commands/__init__.py b/src/mailman_pgp/commands/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/commands/__init__.py
+++ b/src/mailman_pgp/commands/__init__.py
diff --git a/src/pgpmailman/commands/eml_key.py b/src/mailman_pgp/commands/eml_key.py
index 03c0877..03c0877 100644
--- a/src/pgpmailman/commands/eml_key.py
+++ b/src/mailman_pgp/commands/eml_key.py
diff --git a/src/pgpmailman/config/__init__.py b/src/mailman_pgp/config/__init__.py
index a6f7004..a6f7004 100644
--- a/src/pgpmailman/config/__init__.py
+++ b/src/mailman_pgp/config/__init__.py
diff --git a/src/mailman_pgp/config/mailman.cfg b/src/mailman_pgp/config/mailman.cfg
new file mode 100644
index 0000000..7bd45a7
--- /dev/null
+++ b/src/mailman_pgp/config/mailman.cfg
@@ -0,0 +1,20 @@
+
+# Example additions to mailman.cfg to enable PGP
+
+[plugin.pgp]
+class: mailman_pgp.plugin.PGPMailman
+path: mailman_pgp
+enable: yes
+configuration: python:mailman_pgp.config.pgpmailman
+
+[runner.in]
+class: mailman_pgp.runners.incoming.IncomingRunner
+
+[runner.in_default]
+class: mailman.runners.incoming.IncomingRunner
+
+[runner.out]
+class: mailman_pgp.runners.outgoing.OutgoingRunner
+
+[runner.out_default]
+class: mailman.runners.outgoing.OutgoingRunner
diff --git a/src/mailman_pgp/config/pgpmailman.cfg b/src/mailman_pgp/config/pgpmailman.cfg
new file mode 100644
index 0000000..45aa7b0
--- /dev/null
+++ b/src/mailman_pgp/config/pgpmailman.cfg
@@ -0,0 +1,16 @@
+# Default PGP config
+
+[db]
+# db path the PGP plugin will use to store list/user configuration (not keys!).
+url =  sqlite:////$DATA_DIR/pgp.db
+
+[keyrings]
+# Keyring used to store list keypairs.
+core = $DATA_DIR/pgp_core.gpp
+
+# Keyring used to store user public keys.
+users = $DATA_DIR/pgp_users.gpg
+
+[queues]
+in = in_default
+out = out_default
\ No newline at end of file
diff --git a/src/pgpmailman/database/__init__.py b/src/mailman_pgp/database/__init__.py
index 01975ad..b799942 100644
--- a/src/pgpmailman/database/__init__.py
+++ b/src/mailman_pgp/database/__init__.py
@@ -8,8 +8,8 @@ from public import public
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from pgpmailman.config import config
-from pgpmailman.model.base import Base
+from mailman_pgp.config import config
+from mailman_pgp.model.base import Base
 
 
 @public
diff --git a/src/pgpmailman/model/__init__.py b/src/mailman_pgp/model/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/model/__init__.py
+++ b/src/mailman_pgp/model/__init__.py
diff --git a/src/pgpmailman/model/base.py b/src/mailman_pgp/model/base.py
index e25407f..e25407f 100644
--- a/src/pgpmailman/model/base.py
+++ b/src/mailman_pgp/model/base.py
diff --git a/src/pgpmailman/model/list.py b/src/mailman_pgp/model/list.py
index 98b0078..f781a9a 100644
--- a/src/pgpmailman/model/list.py
+++ b/src/mailman_pgp/model/list.py
@@ -5,7 +5,7 @@ from mailman.interfaces.action import Action
 from public import public
 from sqlalchemy import Boolean, Column, Integer
 
-from pgpmailman.model.base import Base
+from mailman_pgp.model.base import Base
 
 
 @public
diff --git a/src/pgpmailman/pgp/__init__.py b/src/mailman_pgp/pgp/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/pgp/__init__.py
+++ b/src/mailman_pgp/pgp/__init__.py
diff --git a/src/mailman_pgp/pgp/keyrings.py b/src/mailman_pgp/pgp/keyrings.py
new file mode 100644
index 0000000..d4fd4b4
--- /dev/null
+++ b/src/mailman_pgp/pgp/keyrings.py
@@ -0,0 +1,3 @@
+
+from public import public
+
diff --git a/src/pgpmailman/plugin.py b/src/mailman_pgp/plugin.py
index 820d0a9..e6eec4f 100644
--- a/src/pgpmailman/plugin.py
+++ b/src/mailman_pgp/plugin.py
@@ -7,10 +7,10 @@ from mailman.utilities.modules import expand_path
 from public import public
 from zope.interface import implementer
 
-from pgpmailman.config import config
-from pgpmailman.database import Database, transaction
-from pgpmailman.model.list import EncryptedMailingList
-from pgpmailman.rest.root import RESTRoot
+from mailman_pgp.config import config
+from mailman_pgp.database import Database, transaction
+from mailman_pgp.model.list import EncryptedMailingList
+from mailman_pgp.rest.root import RESTRoot
 
 
 @public
diff --git a/src/pgpmailman/rest/__init__.py b/src/mailman_pgp/rest/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/rest/__init__.py
+++ b/src/mailman_pgp/rest/__init__.py
diff --git a/src/pgpmailman/rest/lists.py b/src/mailman_pgp/rest/lists.py
index fa785ee..e0d2b0f 100644
--- a/src/pgpmailman/rest/lists.py
+++ b/src/mailman_pgp/rest/lists.py
@@ -4,8 +4,8 @@ from mailman.rest.helpers import (
     child, CollectionMixin, etag, not_found, NotFound, okay)
 from public import public
 
-from pgpmailman.config import config
-from pgpmailman.model.list import EncryptedMailingList
+from mailman_pgp.config import config
+from mailman_pgp.model.list import EncryptedMailingList
 
 
 class _EncryptedBase(CollectionMixin):
@@ -46,7 +46,7 @@ class AnEncryptedList(_EncryptedBase):
         else:
             okay(response, self._resource_as_json(self._mlist))
 
-    @child
+    @child()
     def key(self, context, segments):
         if self._mlist is None:
             return NotFound(), []
diff --git a/src/pgpmailman/rest/root.py b/src/mailman_pgp/rest/root.py
index 68afa96..286d9ae 100644
--- a/src/pgpmailman/rest/root.py
+++ b/src/mailman_pgp/rest/root.py
@@ -16,8 +16,8 @@ REST root.
 from mailman.rest.helpers import child
 from public import public
 
-from pgpmailman.rest.lists import AllEncryptedLists, AnEncryptedList
-from pgpmailman.rest.users import AllUsers, AUser
+from mailman_pgp.rest.lists import AllEncryptedLists, AnEncryptedList
+from mailman_pgp.rest.users import AllUsers, AUser
 
 
 @public
diff --git a/src/pgpmailman/rest/users.py b/src/mailman_pgp/rest/users.py
index 09990f6..09990f6 100644
--- a/src/pgpmailman/rest/users.py
+++ b/src/mailman_pgp/rest/users.py
diff --git a/src/pgpmailman/runners/__init__.py b/src/mailman_pgp/runners/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/runners/__init__.py
+++ b/src/mailman_pgp/runners/__init__.py
diff --git a/src/pgpmailman/runners/incoming.py b/src/mailman_pgp/runners/incoming.py
index 69bbba9..f13b971 100644
--- a/src/pgpmailman/runners/incoming.py
+++ b/src/mailman_pgp/runners/incoming.py
@@ -6,8 +6,8 @@ from mailman.email.message import Message
 from mailman.model.mailinglist import MailingList
 from public import public
 
-from pgpmailman.config import config
-from pgpmailman.model.list import EncryptedMailingList
+from mailman_pgp.config import config
+from mailman_pgp.model.list import EncryptedMailingList
 
 
 @public
diff --git a/src/pgpmailman/runners/outgoing.py b/src/mailman_pgp/runners/outgoing.py
index 11118a2..2723b17 100644
--- a/src/pgpmailman/runners/outgoing.py
+++ b/src/mailman_pgp/runners/outgoing.py
@@ -6,8 +6,8 @@ from mailman.email.message import Message
 from mailman.model.mailinglist import MailingList
 from public import public
 
-from pgpmailman.config import config
-from pgpmailman.model.list import EncryptedMailingList
+from mailman_pgp.config import config
+from mailman_pgp.model.list import EncryptedMailingList
 
 
 @public
diff --git a/src/pgpmailman/styles/__init__.py b/src/mailman_pgp/styles/__init__.py
index e69de29..e69de29 100644
--- a/src/pgpmailman/styles/__init__.py
+++ b/src/mailman_pgp/styles/__init__.py
diff --git a/src/pgpmailman/styles/announce.py b/src/mailman_pgp/styles/announce.py
index 26fc01f..b4eae80 100644
--- a/src/pgpmailman/styles/announce.py
+++ b/src/mailman_pgp/styles/announce.py
@@ -3,7 +3,7 @@
 from mailman.styles.default import LegacyAnnounceOnly
 from public import public
 
-from pgpmailman.styles.base import EncryptedStyle
+from mailman_pgp.styles.base import EncryptedStyle
 
 
 @public
diff --git a/src/pgpmailman/styles/base.py b/src/mailman_pgp/styles/base.py
index 633b95b..36d11c7 100644
--- a/src/pgpmailman/styles/base.py
+++ b/src/mailman_pgp/styles/base.py
@@ -2,9 +2,9 @@
 
 from public import public
 
-from pgpmailman.config import config
-from pgpmailman.database import transaction
-from pgpmailman.model.list import EncryptedMailingList
+from mailman_pgp.config import config
+from mailman_pgp.database import transaction
+from mailman_pgp.model.list import EncryptedMailingList
 
 
 @public
diff --git a/src/pgpmailman/styles/discussion.py b/src/mailman_pgp/styles/discussion.py
index e8c516a..f9db7a7 100644
--- a/src/pgpmailman/styles/discussion.py
+++ b/src/mailman_pgp/styles/discussion.py
@@ -3,7 +3,7 @@
 from mailman.styles.default import LegacyDefaultStyle
 from public import public
 
-from pgpmailman.styles.base import EncryptedStyle
+from mailman_pgp.styles.base import EncryptedStyle
 
 
 @public
diff --git a/src/pgpmailman/config/mailman.cfg b/src/pgpmailman/config/mailman.cfg
deleted file mode 100644
index 38ff416..0000000
--- a/src/pgpmailman/config/mailman.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-[plugin.pgp]
-class: pgpmailman.plugin.PGPMailman
-path: pgpmailman
-enable: yes
-configuration: python:pgpmailman.config.pgpmailman
-
-[runner.in]
-class: pgpmailman.runners.incoming.IncomingRunner
-
-[runner.in_default]
-class: mailman.runners.incoming.IncomingRunner
-
-[runner.out]
-class: pgpmailman.runners.outgoing.OutgoingRunner
-
-[runner.out_default]
-class: mailman.runners.outgoing.OutgoingRunner
diff --git a/src/pgpmailman/config/pgpmailman.cfg b/src/pgpmailman/config/pgpmailman.cfg
deleted file mode 100644
index 541e9c6..0000000
--- a/src/pgpmailman/config/pgpmailman.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[db]
-url =  sqlite:////$DATA_DIR/pgp.db
-
-[keyrings]
-core = $DATA_DIR/pgp_core.gpp
-users = $DATA_DIR/pgp_users.gpg
-
-[queues]
-in = in_default
-out = out_default
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 59d8123..a9763ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,4 +21,4 @@ hang-closing = True
 jobs = 1
 max-line-length = 79
 import-order-style = google
-application-import-names = pgpmailman
+application-import-names = mailman_pgp