1 files changed, 9 insertions, 21 deletions

diff --git a/src/mailman_pgp/model/list.py b/src/mailman_pgp/model/list.py
index 8b2b5bc..9bee16d 100644
--- a/src/mailman_pgp/model/list.py
+++ b/src/mailman_pgp/model/list.py
@@ -44,36 +44,24 @@ class PGPMailingList(Base):
     list_id = Column(SAUnicode, index=True)
 
     # Signature related properties
-    unsigned_msg_action = Column(Enum(Action))
-    inline_pgp_action = Column(Enum(Action))
-    expired_sig_action = Column(Enum(Action))
-    revoked_sig_action = Column(Enum(Action))
-    # duplicate_sig_action = Column(Enum(Action))
-    invalid_sig_action = Column(Enum(Action))
-    strip_original_sig = Column(Boolean)
-    sign_outgoing = Column(Boolean)
+    unsigned_msg_action = Column(Enum(Action), default=Action.reject)
+    inline_pgp_action = Column(Enum(Action), default=Action.defer)
+    expired_sig_action = Column(Enum(Action), default=Action.reject)
+    revoked_sig_action = Column(Enum(Action), default=Action.reject)
+    invalid_sig_action = Column(Enum(Action), default=Action.reject)
+    duplicate_sig_action = Column(Enum(Action), default=Action.reject)
+    strip_original_sig = Column(Boolean, default=False)
+    sign_outgoing = Column(Boolean, default=False)
 
     # Encryption related properties
-    nonencrypted_msg_action = Column(Enum(Action))
+    nonencrypted_msg_action = Column(Enum(Action), default=Action.reject)
 
     def __init__(self, mlist):
         super().__init__()
         self._init()
-        self._defaults()
         self.list_id = mlist.list_id
         self._mlist = mlist
 
-    def _defaults(self):
-        self.unsigned_msg_action = Action.reject
-        self.inline_pgp_action = Action.defer
-        self.expired_sig_action = Action.reject
-        self.revoked_sig_action = Action.reject
-        self.invalid_sig_action = Action.reject
-        self.strip_original_sig = False
-        self.sign_outgoing = False
-
-        self.nonencrypted_msg_action = Action.reject
-
     @reconstructor
     def _init(self):
         self._mlist = None