From b3dc32412f78da03192e0ddae9648012620c444d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 10 May 2013 00:58:50 +0900 Subject: bump version moved tac file to pkg --- MANIFEST.in | 1 - mx.tac | 84 ------------------------------------------------- pkg/mx.tac | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 4 +-- src/leap/mx/__init__.py | 2 +- 5 files changed, 87 insertions(+), 88 deletions(-) delete mode 100755 mx.tac create mode 100755 pkg/mx.tac diff --git a/MANIFEST.in b/MANIFEST.in index 2e20cce..6bb33b5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ include data/* include pkg/* include pkg/utils/* -include mx.tac diff --git a/mx.tac b/mx.tac deleted file mode 100755 index cdebba7..0000000 --- a/mx.tac +++ /dev/null @@ -1,84 +0,0 @@ -# -*- encoding: utf-8 -*- -# mx.tac -# Copyright (C) 2013 LEAP -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import sys -import ConfigParser - -from functools import partial - -from leap.mx import couchdbhelper -from leap.mx.mail_receiver import MailReceiver -from leap.mx.alias_resolver import AliasResolverFactory -from leap.mx.check_recipient_access import CheckRecipientAccessFactory - -try: - from twisted.application import service, internet - from twisted.internet import inotify - from twisted.internet.endpoints import TCP4ServerEndpoint - from twisted.python import filepath, log - from twisted.python import usage -except ImportError, ie: - print "This software requires Twisted>=12.0.2, please see the README for" - print "help on using virtualenv and pip to obtain requirements." - -config_file = "/etc/leap/mx.conf" - -config = ConfigParser.ConfigParser() -config.read(config_file) - -user = config.get("couchdb", "user") -password = config.get("couchdb", "password") - -server = config.get("couchdb", "server") -port = config.get("couchdb", "port") - -alias_port = config.getint("alias map", "port") -check_recipient_port = config.getint("check recipient", "port") - -cdb = couchdbhelper.ConnectedCouchDB(server, - port=port, - dbName="users", - username=user, - password=password) - - -application = service.Application("LEAP MX") - -# Alias map -alias_map = internet.TCPServer(alias_port, AliasResolverFactory(couchdb=cdb)) -alias_map.setServiceParent(application) - -# Check recipient access -check_recipient = internet.TCPServer(check_recipient_port, - CheckRecipientAccessFactory(couchdb=cdb)) -check_recipient.setServiceParent(application) - -# Mail receiver -mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user, - password, - server, - port) -directories = [] -for section in config.sections(): - if section in ("couchdb", "alias map", "check recipient"): - continue - to_watch = config.get(section, "path") - recursive = config.getboolean(section, "recursive") - directories.append([to_watch, recursive]) - -mr = MailReceiver(mail_couch_url_prefix, cdb, directories) -mr.setServiceParent(application) diff --git a/pkg/mx.tac b/pkg/mx.tac new file mode 100755 index 0000000..cdebba7 --- /dev/null +++ b/pkg/mx.tac @@ -0,0 +1,84 @@ +# -*- encoding: utf-8 -*- +# mx.tac +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import sys +import ConfigParser + +from functools import partial + +from leap.mx import couchdbhelper +from leap.mx.mail_receiver import MailReceiver +from leap.mx.alias_resolver import AliasResolverFactory +from leap.mx.check_recipient_access import CheckRecipientAccessFactory + +try: + from twisted.application import service, internet + from twisted.internet import inotify + from twisted.internet.endpoints import TCP4ServerEndpoint + from twisted.python import filepath, log + from twisted.python import usage +except ImportError, ie: + print "This software requires Twisted>=12.0.2, please see the README for" + print "help on using virtualenv and pip to obtain requirements." + +config_file = "/etc/leap/mx.conf" + +config = ConfigParser.ConfigParser() +config.read(config_file) + +user = config.get("couchdb", "user") +password = config.get("couchdb", "password") + +server = config.get("couchdb", "server") +port = config.get("couchdb", "port") + +alias_port = config.getint("alias map", "port") +check_recipient_port = config.getint("check recipient", "port") + +cdb = couchdbhelper.ConnectedCouchDB(server, + port=port, + dbName="users", + username=user, + password=password) + + +application = service.Application("LEAP MX") + +# Alias map +alias_map = internet.TCPServer(alias_port, AliasResolverFactory(couchdb=cdb)) +alias_map.setServiceParent(application) + +# Check recipient access +check_recipient = internet.TCPServer(check_recipient_port, + CheckRecipientAccessFactory(couchdb=cdb)) +check_recipient.setServiceParent(application) + +# Mail receiver +mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user, + password, + server, + port) +directories = [] +for section in config.sections(): + if section in ("couchdb", "alias map", "check recipient"): + continue + to_watch = config.get(section, "path") + recursive = config.getboolean(section, "recursive") + directories.append([to_watch, recursive]) + +mr = MailReceiver(mail_couch_url_prefix, cdb, directories) +mr.setServiceParent(application) diff --git a/setup.py b/setup.py index 136d7b4..cc4c759 100644 --- a/setup.py +++ b/setup.py @@ -44,11 +44,11 @@ else: # be automatically # placed by distutils, using whatever interpreter is # available. - data_files = [("/usr/local/bin/", ["mx.tac"]), + data_files = [("/usr/local/bin/", ["pkg/mx.tac"]), ("/etc/init.d/", ["pkg/leap_mx"])] setup( name='leap.mx', - version="0.2.1-dev", + version="0.2.2-dev", # bump also src/leap/mx/__init__ url="http://github.com/leapcode/leap_mx", license='AGPLv3+', diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py index e8c7a5f..e3efc24 100644 --- a/src/leap/mx/__init__.py +++ b/src/leap/mx/__init__.py @@ -17,4 +17,4 @@ """ Module initialization file for leap.mx . """ -__version__ = "0.2.1-dev" +__version__ = "0.2.2-dev" -- cgit v1.2.3