evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:modoboa/modoboa-installer

Browse Source
This commit is contained in:
Antoine Nguyen
2015-10-31 14:43:08 +01:00
parent f983b6f237 722c619e2d
commit 7d3ee4c07e
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
README.rst
View File

@@ -23,3 +23,10 @@ By default, the following components are installed:
* Postfix * Postfix
* Dovecot * Dovecot
* Amavis (with SpamAssassin and ClamAV) * Amavis (with SpamAssassin and ClamAV)
If you want to follow details of installation process, use --debug
At the end of the process, you should consider updating virus database with this command::
freshclam
/etc/init.d/clamav-daemon restart

3
modoboa_installer/scripts/dovecot.py
View File

@@ -50,8 +50,7 @@ class Dovecot(base.Installer):
def post_run(self): def post_run(self):
"""Additional tasks.""" """Additional tasks."""
if self.dbengine != "postgres": if self.dbengine == "postgres":
return
dbname = self.config.get("modoboa", "dbname") dbname = self.config.get("modoboa", "dbname")
dbuser = self.config.get("modoboa", "dbuser") dbuser = self.config.get("modoboa", "dbuser")
dbpassword = self.config.get("modoboa", "dbpassword") dbpassword = self.config.get("modoboa", "dbpassword")

7
modoboa_installer/scripts/files/amavis/amavis_mysql_2.10.1.sql
View File

@@ -162,7 +162,8 @@ CREATE TABLE msgs (
subject varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '', subject varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '',
-- mail Subject header field, UTF8 -- mail Subject header field, UTF8
host varchar(255) NOT NULL, -- hostname where amavisd is running host varchar(255) NOT NULL, -- hostname where amavisd is running
PRIMARY KEY (partition_tag,mail_id) PRIMARY KEY (partition_tag,mail_id),
INDEX (mail_id),
FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT
) ENGINE=InnoDB; ) ENGINE=InnoDB;
CREATE INDEX msgs_idx_sid ON msgs (sid); CREATE INDEX msgs_idx_sid ON msgs (sid);
@@ -191,7 +192,7 @@ CREATE TABLE msgrcpt (
wl char(1) DEFAULT ' ', -- sender whitelisted by this recip wl char(1) DEFAULT ' ', -- sender whitelisted by this recip
bspam_level float, -- per-recipient (total) spam level bspam_level float, -- per-recipient (total) spam level
smtp_resp varchar(255) DEFAULT '', -- SMTP response given to MTA smtp_resp varchar(255) DEFAULT '', -- SMTP response given to MTA
PRIMARY KEY (partition_tag,mail_id,rseqnum) PRIMARY KEY (partition_tag,mail_id,rseqnum),
FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT, FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT,
FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE
) ENGINE=InnoDB; ) ENGINE=InnoDB;
@@ -208,7 +209,7 @@ CREATE TABLE quarantine (
mail_id varbinary(16) NOT NULL, -- long-term unique mail id mail_id varbinary(16) NOT NULL, -- long-term unique mail id
chunk_ind integer unsigned NOT NULL, -- chunk number, starting with 1 chunk_ind integer unsigned NOT NULL, -- chunk number, starting with 1
mail_text blob NOT NULL, -- store mail as chunks of octets mail_text blob NOT NULL, -- store mail as chunks of octets
PRIMARY KEY (partition_tag,mail_id,chunk_ind) PRIMARY KEY (partition_tag,mail_id,chunk_ind),
FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE
) ENGINE=InnoDB; ) ENGINE=InnoDB;

1
modoboa_installer/scripts/files/amavis/amavis_mysql_2.7.1.sql
View File

@@ -165,6 +165,7 @@ CREATE TABLE msgs (
-- mail Subject header field, UTF8 -- mail Subject header field, UTF8
host varchar(255) NOT NULL, -- hostname where amavisd is running host varchar(255) NOT NULL, -- hostname where amavisd is running
PRIMARY KEY (partition_tag,mail_id), PRIMARY KEY (partition_tag,mail_id),
INDEX (mail_id),
FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT
) ENGINE=InnoDB; ) ENGINE=InnoDB;
CREATE INDEX msgs_idx_sid ON msgs (sid); CREATE INDEX msgs_idx_sid ON msgs (sid);