From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 11 Jun 2012 05:00:57 -0400 Subject: [PATCH] Updated version number to 3.0.4.6 --- install/dist/lib/debian60.lib.php | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php index 5f79e27..88ba5d2 100644 --- a/install/dist/lib/debian60.lib.php +++ b/install/dist/lib/debian60.lib.php @@ -76,7 +76,20 @@ if(is_file($config_dir.'/'.$configfile)){ copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~'); } - copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile); + + //* Get the dovecot version + exec('dovecot --version',$tmp); + $parts = explode('.',trim($tmp[0])); + $dovecot_version = $parts[0]; + unset($tmp); + unset($parts); + + //* Copy dovecot configuration file + if($dovecot_version == 2) { + copy('tpl/debian6_dovecot2.conf.master',$config_dir.'/'.$configfile); + } else { + copy('tpl/debian6_dovecot.conf.master',$config_dir.'/'.$configfile); + } //* dovecot-sql.conf $configfile = 'dovecot-sql.conf'; @@ -96,7 +109,21 @@ chgrp($config_dir.'/'.$configfile, 'root'); } + + public function configure_apache() { + global $conf; + + if(file_exists('/etc/apache2/mods-available/fcgid.conf')) replaceLine('/etc/apache2/mods-available/fcgid.conf','MaxRequestLen','MaxRequestLen 15728640',0,1); + + parent::configure_apache(); + } + public function configure_fail2ban() { + /* + copy('tpl/dovecot-pop3imap.conf.master',"/etc/fail2ban/filter.d/dovecot-pop3imap.conf"); + copy('tpl/dovecot_fail2ban_jail.local.master','/etc/fail2ban/jail.local'); + */ + } } -?> +?> \ No newline at end of file -- Gitblit v1.9.1