Fix some naming as we are no longer using gpg anywhere.

4 files changed, 7 insertions, 7 deletions

diff --git a/src/mailman_pgp/config/mailman_pgp.cfg b/src/mailman_pgp/config/mailman_pgp.cfg
index a287b18..affcd70 100644
--- a/src/mailman_pgp/config/mailman_pgp.cfg
+++ b/src/mailman_pgp/config/mailman_pgp.cfg
@@ -7,13 +7,13 @@ url = sqlite:////$DATA_DIR/pgp.db
 
 [keydirs]
 # Key directory used to store user public keys.
-user_keydir= $DATA_DIR/gpg/user_keydir/
+user_keydir= $DATA_DIR/pgp/user_keydir/
 
 # Key directory used to store list keypairs.
-list_keydir = $DATA_DIR/gpg/list_keydir/
+list_keydir = $DATA_DIR/pgp/list_keydir/
 
 # Key directory used to store list archive public keys.
-archive_keydir = $DATA_DIR/gpg/archive_keydir/
+archive_keydir = $DATA_DIR/pgp/archive_keydir/
 
 
 [keypairs]
diff --git a/src/mailman_pgp/model/list.py b/src/mailman_pgp/model/list.py
index fa5b89b..e53d61b 100644
--- a/src/mailman_pgp/model/list.py
+++ b/src/mailman_pgp/model/list.py
@@ -37,7 +37,7 @@ class EncryptedMailingList(Base):
 
     def _generate(self, mlist):
         self._key_queue = SimpleQueue()
-        self._key_generator = ListKeyGenerator(config.gpg.keypair_config,
+        self._key_generator = ListKeyGenerator(config.pgp.keypair_config,
                                                mlist.display_name,
                                                mlist.posting_address,
                                                mlist.request_address,
@@ -73,6 +73,6 @@ class EncryptedMailingList(Base):
 
     @property
     def key_path(self):
-        return join(config.gpg.keydir_config['list_keydir'],
+        return join(config.pgp.keydir_config['list_keydir'],
                     self.list_id,
                     '.asc')
diff --git a/src/mailman_pgp/pgp/__init__.py b/src/mailman_pgp/pgp/__init__.py
index 62c6045..e1627e1 100644
--- a/src/mailman_pgp/pgp/__init__.py
+++ b/src/mailman_pgp/pgp/__init__.py
@@ -35,7 +35,7 @@ class PGP:
         self.keypair_config = dict(
             (k, config.get('keypairs', k)) for k in KEYPAIR_CONFIG_VARIABLES)
 
-        # Get and expand all [gpg] config paths against Mailman's directories.
+        # Get and expand all [keydirs] config paths against Mailman's directories.
         self.keydir_config = dict(
             (k, expand(config.get('keydirs', k), None, mailman_config.paths))
             for k in KEYDIR_CONFIG_PATHS)
diff --git a/src/mailman_pgp/plugin.py b/src/mailman_pgp/plugin.py
index c9ee3d9..033c46d 100644
--- a/src/mailman_pgp/plugin.py
+++ b/src/mailman_pgp/plugin.py
@@ -19,7 +19,7 @@ class PGPMailman:
         """See `IPlugin`."""
         config.load(self.name)
         config.db = Database()
-        config.gpg = PGP()
+        config.pgp = PGP()
 
     def post_hook(self):
         """See `IPlugin`."""