1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
Index: mx/pkg/mx.tac
===================================================================
--- mx.orig/pkg/mx.tac 2013-07-18 12:29:54.209755118 -0400
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -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 <http://www.gnu.org/licenses/>.
-
-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)
Index: mx/pkg/leap_mx.tac
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ mx/pkg/leap_mx.tac 2013-07-18 12:29:54.205755201 -0400
@@ -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 <http://www.gnu.org/licenses/>.
+
+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)
Index: mx/pkg/leap_mx
===================================================================
--- mx.orig/pkg/leap_mx 2013-07-18 11:42:29.458087240 -0400
+++ mx/pkg/leap_mx 2013-07-18 12:32:06.762949814 -0400
@@ -4,8 +4,9 @@
pidfile=/var/run/leap_mx.pid \
rundir=/var/lib/leap_mx/ \
-file=/usr/local/bin/mx.tac \
+file=/usr/share/app/leap_mx.tac \
logfile=/var/log/leap_mx.log
+twistd_path=/usr/bin/twistd
[ -r /etc/default/leap_mx ] && . /etc/default/leap_mx
@@ -17,7 +18,7 @@
start)
echo -n "Starting leap_mx: twistd"
HOME="/var/lib/leap_mx/" \
- start-stop-daemon --start --quiet --exec /usr/local/bin/twistd -- \
+ start-stop-daemon --start --quiet --exec $twistd_path -- \
--pidfile=$pidfile \
--rundir=$rundir \
--python=$file \
|
