install/tpl/apps_php_fpm_pool.conf.master

-[{fpm_pool}-{fpm_domain}]
-
-listen = {fpm_socket}
-listen.owner = {fpm_user}
-listen.group = {fpm_group}
-listen.mode = 0660
-
-user = {fpm_user}
-group = {fpm_group}
-
-pm = dynamic
-pm.max_children = 500
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 5
-
-chdir = /
-
-; php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share
-php_admin_flag[magic_quotes_gpc] = off
\ No newline at end of file

install/tpl/apps_php_fpm_pool.conf.master

+../../server/conf/apps_php_fpm_pool.conf.master
\ No newline at end of file

install/tpl/bastille-firewall.cfg.master

+../../server/conf/bastille-firewall.cfg.master
\ No newline at end of file

install/tpl/config.inc.php.master

@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.2.0dev');
 define('DEVSYSTEM', 0);
 
 

install/tpl/debian6_dovecot2.conf.master

@@ -8,6 +8,7 @@ ssl_cert = </etc/postfix/smtpd.cert
 ssl_key = </etc/postfix/smtpd.key
 ssl_protocols = !SSLv2 !SSLv3
 mail_max_userip_connections = 100
+mail_plugins = quota
 passdb {
   args = /etc/dovecot/dovecot-sql.conf
   driver = sql
@@ -66,7 +67,6 @@ protocol lmtp {
   postmaster_address = webmaster@localhost
   mail_plugins = quota sieve
 }
-mail_plugins = $mail_plugins quota
 imap_capability=+SEPCIAL-USE XLIST
 namespace inbox {
   inbox = yes

install/tpl/gentoo_postfix.conf.master

@@ -15,7 +15,7 @@ smtpd_use_tls = yes
 smtpd_tls_security_level = may
 smtpd_tls_cert_file = {config_dir}/smtpd.cert
 smtpd_tls_key_file = {config_dir}/smtpd.key
-transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{config_dir}/mysql-virtual_transports.cf
+transport_maps = proxy:mysql:{config_dir}/mysql-virtual_transports.cf
 relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
 relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
 smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf

install/tpl/mailman-virtual_to_transport.sh

-#!/bin/sh
-sed -r -e 's/(^[^#]\S+\s+).+$/\1local/' $1 > /var/lib/mailman/data/transport-mailman
-/usr/sbin/postmap /var/lib/mailman/data/transport-mailman
\ No newline at end of file