Changeset 789

Timestamp:

09/06/08 03:37:09 (3 months ago)

Author:

free

Message:

Added class _Spamassassin

Location:

ares/trunk

Files:

• ares.py (modified) (2 diffs)
• tests/TestAres.py (modified) (1 diff)

ares/trunk/ares.py

@@ -49 +49 @@
 
         # Setup classes
-        self.ldap     = _Ldap(self)
-        self.squid    = _Squid(self)
-        self.hostname = _Hostname(self)
-        self.dnsmasq  = _Dnsmasq(self)
-        self.hosts    = _Hosts(self)
-        self.monit    = _Monit(self)
-        self.ssl      = _Ssl(self)
-        self.squirrel = _Squirrel(self)
-        self.amavis   = _Amavis(self)
+        self.ldap         = _Ldap(self)
+        self.squid        = _Squid(self)
+        self.hostname     = _Hostname(self)
+        self.dnsmasq      = _Dnsmasq(self)
+        self.hosts        = _Hosts(self)
+        self.monit        = _Monit(self)
+        self.ssl          = _Ssl(self)
+        self.squirrel     = _Squirrel(self)
+        self.amavis       = _Amavis(self)
+        self.spamassassin = _Spamassassin(self)
 
 if __name__ == '__main__':
@@ -409 +410 @@
             raise AresError('F: %s' % cmd)
 
+#
+# Spamassassin
+#
+class _Spamassassin:
+
+    def __init__(self, ares):
+        self._ares = ares
+        self._cfg  = '/files/etc/default/spamassassin'
+
+    def setup(self):
+
+        aug = self._ares.aug
+        cfg = self._cfg
+
+        aug.set(cfg + '/ENABLED', '1')
+        aug.set(cfg + '/CRON', '1')

ares/trunk/tests/TestAres.py

@@ -24 +24 @@
         ares.squirrel.setup()
         ares.amavis.setup()
+        ares.spamassassin.setup()
         ares.aug.save()