github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Few fixes.

Browse Source
This commit is contained in:
Antoine Nguyen
2015-02-03 09:08:41 +01:00
parent 0b86a686aa
commit f757ec2273
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/getting_started/install.rst
+1 -2
View File
@@ -9,8 +9,7 @@ Requirements
************
* `Python version 2.6+ <http://python.org/>`_
* `Django version 1.6+ <http://docs.djangoproject.com/en/dev/intro/install/#intro-install>`_
* `south version 0.7+ <http://south.aeracode.org/>`_
* `Django version 1.7+ <http://docs.djangoproject.com/en/dev/intro/install/#intro-install>`_
* `lxml python module <http://lxml.de/installation.html>`_
* `pycrypto python module <http://www.dlitz.net/software/pycrypto/>`_
* `rrdtool python binding <http://oss.oetiker.ch/rrdtool/>`_
modoboa/core/commands/postfix_maps.py
+5 -1
View File
@@ -203,7 +203,11 @@ class RelayRecipientVerification(MapFile):
filename = "sql-relay-recipient-verification.cf"
mysql = "SELECT 'reject_unverified_recipient' FROM postfix_relay_domains_relaydomain WHERE verify_recipients=1 AND name='%d'"
postgres = "SELECT 'reject_unverified_recipient' FROM postfix_relay_domains_relaydomain WHERE verify_recipients AND name='%d'"
sqlite = "SELECT 'reject_unverified_recipient' FROM postfix_relay_domains_relaydomain WHERE verify_recipients=1 AND name='%d'"
sqlite = (
"SELECT 'reject_unverified_recipient' "
"FROM postfix_relay_domains_relaydomain "
"WHERE verify_recipients=1 AND name='%d'"
)
class PostfixMapsCommand(Command):
tests/install_from_scratch.py
+2 -2
View File
@@ -36,7 +36,7 @@ class DeployTest(unittest.TestCase):
def test_standard(self):
timeout = 2
cmd = (
"modoboa-admin.py deploy --dbaction install --collectstatic {0}"
"modoboa-admin.py deploy --collectstatic {0}"
.format(self.projname)
)
child = pexpect.spawn(cmd, cwd=self.workdir)
@@ -65,7 +65,7 @@ class DeployTest(unittest.TestCase):
% (self.dbtype, self.dbuser, self.dbpassword,
self.dbhost, self.projname)
cmd = (
"modoboa-admin.py deploy --dbaction install --collectstatic "
"modoboa-admin.py deploy --collectstatic "
"--dburl %s --domain %s %s"
% (dburl, 'localhost', self.projname)
)