From 24c2a98d81c3fd7e52baaff6dc0dab9a8e867904 Mon Sep 17 00:00:00 2001 From: "me@adamcoddington.net" Date: Mon, 8 Oct 2012 15:24:42 +0000 Subject: [PATCH] Adding migration for handling incoming messages; adding exim4 scripts for routing messages to django_messages. --HG-- branch : exim4_pipe --- .../0002_auto__chg_field_mailbox_uri.py | 39 +++++++++++++++++++ django_mailbox/models.py | 1 + scripts/router | 6 +++ scripts/transport | 8 ++++ 4 files changed, 54 insertions(+) create mode 100644 django_mailbox/migrations/0002_auto__chg_field_mailbox_uri.py create mode 100644 scripts/router create mode 100644 scripts/transport diff --git a/django_mailbox/migrations/0002_auto__chg_field_mailbox_uri.py b/django_mailbox/migrations/0002_auto__chg_field_mailbox_uri.py new file mode 100644 index 0000000..3ff3098 --- /dev/null +++ b/django_mailbox/migrations/0002_auto__chg_field_mailbox_uri.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'Mailbox.uri' + db.alter_column('django_mailbox_mailbox', 'uri', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) + + def backwards(self, orm): + + # User chose to not deal with backwards NULL issues for 'Mailbox.uri' + raise RuntimeError("Cannot reverse this migration. 'Mailbox.uri' and its values cannot be restored.") + + models = { + 'django_mailbox.mailbox': { + 'Meta': {'object_name': 'Mailbox'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'uri': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + 'django_mailbox.message': { + 'Meta': {'object_name': 'Message'}, + 'body': ('django.db.models.fields.TextField', [], {}), + 'from_address': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'messages'", 'to': "orm['django_mailbox.Mailbox']"}), + 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'received': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + } + } + + complete_apps = ['django_mailbox'] \ No newline at end of file diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 30d697b..5e91395 100755 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -24,6 +24,7 @@ class Mailbox(models.Model): contain illegal characters (like @, :, etc). """, blank=True, + null=True, default=None, ) diff --git a/scripts/router b/scripts/router new file mode 100644 index 0000000..3980d16 --- /dev/null +++ b/scripts/router @@ -0,0 +1,6 @@ +django_mailbox: + debug_print = 'R: django_mailbox for $localpart@$domain" + driver = accept + domains = +local_domains + transport = send_to_django_mailbox + local_parts = emailaddressusername : anotheremailaddressusername diff --git a/scripts/transport b/scripts/transport new file mode 100644 index 0000000..21a2d1a --- /dev/null +++ b/scripts/transport @@ -0,0 +1,8 @@ + +send_to_django_mailbox: + driver = pipe + command = /path/to/python /path/to/manage.py processincomingmessage + user = www-data + group = www-data + return_path_add + delivery_date_add