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

modoboa_installer/database.py

@@ -153,7 +153,7 @@ class MySQL(Database):
 
     default_port = 3306
     packages = {
-        "deb": ["mariadb-server", "libmysqlclient-dev"],
+        "deb": ["mariadb-server"],
         "rpm": ["mariadb", "mariadb-devel", "mariadb-server"],
     }
     service = "mariadb"

modoboa_installer/scripts/files/postfix/main.cf.tpl

@@ -142,10 +142,10 @@ postscreen_blacklist_action = enforce
 
 # Use some DNSBL
 postscreen_dnsbl_sites = 
-	zen.spamhaus.org*3
-	bl.spameatingmonkey.net*2
-	bl.spamcop.net
-	dnsbl.sorbs.net
+	zen.spamhaus.org=127.0.0.[2..11]*3
+	bl.spameatingmonkey.net=127.0.0.2*2
+	bl.spamcop.net=127.0.0.2
+	dnsbl.sorbs.net=127.0.0.[2..15]
 postscreen_dnsbl_threshold = 3 
 postscreen_dnsbl_action = enforce