From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
install/dist/lib/debian60.lib.php | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 3bacd50..88ba5d2 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -38,11 +38,11 @@
//* Configure master.cf and add a line for deliver
if(is_file($config_dir.'/master.cf')){
- copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
- }
+ copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
+ }
if(is_file($config_dir.'/master.cf~')){
- exec('chmod 400 '.$config_dir.'/master.cf~2');
- }
+ chmod($config_dir.'/master.cf~2', 0400);
+ }
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
// Only add the content if we had not addded it before
if(!stristr($content,"dovecot/deliver")) {
@@ -73,29 +73,57 @@
//* copy dovecot.conf
$configfile = 'dovecot.conf';
- if(is_file("$config_dir/$configfile")){
- copy("$config_dir/$configfile", "$config_dir/$configfile~");
- }
- copy('tpl/debian6_dovecot.conf.master',"$config_dir/$configfile");
+ if(is_file($config_dir.'/'.$configfile)){
+ copy($config_dir.'/'.$configfile, $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';
- if(is_file("$config_dir/$configfile")){
- copy("$config_dir/$configfile", "$config_dir/$configfile~");
- }
- exec("chmod 400 $config_dir/$configfile~");
- $content = rf("tpl/debian6_dovecot-sql.conf.master");
+ if(is_file($config_dir.'/'.$configfile)){
+ copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
+ }
+ chmod($config_dir.'/'.$configfile.'~', 0400);
+ $content = rf('tpl/debian6_dovecot-sql.conf.master');
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
$content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content);
- wf("$config_dir/$configfile", $content);
+ wf($config_dir.'/'.$configfile, $content);
- exec("chmod 600 $config_dir/$configfile");
- exec("chown root:root $config_dir/$configfile");
+ chmod($config_dir.'/'.$configfile, 0600);
+ chown($config_dir.'/'.$configfile, 'root');
+ 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