Minor fixes in the installer for Ubuntu 7.10

INSTALL_UBUNTU.txt

@@ -44,16 +44,14 @@ a2enmod rewrite
 
 4) Install pure-ftpd and quota
 
-apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
-
-Edit the file /etc/default/pure-ftpd-common
+First we have to make sure that the capability module is loaded in the kernel
 
-vi /etc/default/pure-ftpd-common
+modprobe capability
+echo 'capability' >> /etc/modules
 
-and change the start mode from inetd to standalone. Then execute:
-
-/etc/init.d/openbsd-inetd restart
+Then we install pureftpd and quota.
 
+apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
 
 5) Install mydns
 

install/lib/install.lib.php

@@ -66,11 +66,11 @@ function get_distname() {
 	
 		if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
 			$distname = 'debian40';
-			swriteln('Operating System: Debian 4.0 or compatible');
+			swriteln("Operating System: Debian 4.0 or compatible\n");
 		}
 		if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
 			$distname = 'debian40';
-			swriteln('Operating System: Debian Lenny/Sid or compatible');
+			swriteln("Operating System: Debian Lenny/Sid or compatible\n");
 		}
 	}
 	

install/lib/installer_base.lib.php

@@ -488,6 +488,8 @@ class installer_base {
 	public function configure_getmail()
     {
 		$config_dir = $this->conf['getmail']['config_dir'];
+		
+		if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
 
 		$command = "useradd -d $config_dir getmail";
 		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

install/sql/ispconfig3.sql

@@ -814,7 +814,7 @@ CREATE TABLE `sys_user` (
 -- Daten fr Tabelle `sys_user`
 -- 
 
-INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
 
 -- --------------------------------------------------------