3 files changed, 29 insertions, 17 deletions

diff --git a/src/mailman_pgp/config/mailman.cfg b/src/mailman_pgp/config/mailman.cfg
index 7bd45a7..92eede1 100644
--- a/src/mailman_pgp/config/mailman.cfg
+++ b/src/mailman_pgp/config/mailman.cfg
@@ -5,7 +5,7 @@
 class: mailman_pgp.plugin.PGPMailman
 path: mailman_pgp
 enable: yes
-configuration: python:mailman_pgp.config.pgpmailman
+configuration: python:mailman_pgp.config.mailman_pgp
 
 [runner.in]
 class: mailman_pgp.runners.incoming.IncomingRunner
diff --git a/src/mailman_pgp/config/mailman_pgp.cfg b/src/mailman_pgp/config/mailman_pgp.cfg
new file mode 100644
index 0000000..0abb026
--- /dev/null
+++ b/src/mailman_pgp/config/mailman_pgp.cfg
@@ -0,0 +1,28 @@
+# Default PGP config
+
+[db]
+# db path the PGP plugin will use to store list/user configuration (not keys!).
+url = sqlite:////$DATA_DIR/pgp.db
+
+
+[gpg]
+# GPG homedir
+homedir = $DATA_DIR/gpg/
+
+# Keyring used to store user keys. (GPG pubring)
+keyring = $DATA_DIR/gpg/pubring.gpg
+
+# Keyring used to store list keypairs. (GPG secring)
+secring = $DATA_DIR/gpg/secring.gpg
+
+
+[keypairs]
+size = 4096
+
+type = RSA
+
+
+[queues]
+in = in_default
+
+out = out_default
\ No newline at end of file
diff --git a/src/mailman_pgp/config/pgpmailman.cfg b/src/mailman_pgp/config/pgpmailman.cfg
deleted file mode 100644
index 45aa7b0..0000000
--- a/src/mailman_pgp/config/pgpmailman.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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