Improved debian installer.

docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt

@@ -154,7 +154,7 @@ rm -rf jailkit-2.11*
 8) Install fail2ban (optional but recomended, because the monitor tries to show the log)
 More info at: http://www.howtoforge.com/fail2ban_debian_etch
 
-apt-get install fail2ban
+apt-get -y install fail2ban
 
 9) Install ISPConfig 3
 

install/lib/install.lib.php

@@ -259,10 +259,14 @@ function mkdirs($strPath, $mode = '0755'){
 
 function rf($file){
 	clearstatcache();
+	if(is_file($file)) {
 		if(!$fp = fopen ($file, 'rb')){
 			ilog('WARNING: could not open file '.$file);
 		}
 		return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
+	} else {
+		return '';
+	}
 }
 
 function wf($file, $content){

install/lib/installer_base.lib.php

@@ -729,7 +729,7 @@ class installer_base {
 		
 		// amavisd user config file
 		$configfile = 'amavisd_user_config';
-		if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["amavis"]["config_dir"].'/conf.d/50-user',$conf["courier"]["config_dir"].'/50-user~');
+		if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user')) copy($conf["amavis"]["config_dir"].'/conf.d/50-user',$conf["amavis"]["config_dir"].'/50-user~');
 		if(is_file($conf["amavis"]["config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/conf.d/50-user~');
 		$content = rf("tpl/".$configfile.".master");
 		$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
@@ -841,7 +841,7 @@ class installer_base {
 		}
 		
 		if(is_file('/etc/inetd.conf')) {
-			replaceLine('/etc/inetd.conf','ftp     stream  tcp     nowait  root    /usr/sbin/tcpd /usr/sbin/pure-ftpd-wrapper','#ftp     stream  tcp     nowait  root    /usr/sbin/tcpd /usr/sbin/pure-ftpd-wrapper',1,0);
+			replaceLine('/etc/inetd.conf','/usr/sbin/pure-ftpd-wrapper','#ftp     stream  tcp     nowait  root    /usr/sbin/tcpd /usr/sbin/pure-ftpd-wrapper',0,0);
 			if(is_file('/etc/init.d/openbsd-inetd')) exec('/etc/init.d/openbsd-inetd restart');
 		}