From 03ade50f9f1826fbe3c21de9cc37fafb7aec8478 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Oct 2007 12:06:38 -0400
Subject: [PATCH] Minor fixes in the installer for Ubuntu 7.10
---
install/lib/installer_base.lib.php | 2 ++
install/sql/ispconfig3.sql | 2 +-
install/lib/install.lib.php | 4 ++--
INSTALL_UBUNTU.txt | 16 +++++++---------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/INSTALL_UBUNTU.txt b/INSTALL_UBUNTU.txt
index 9c16577..b160864 100644
--- a/INSTALL_UBUNTU.txt
+++ b/INSTALL_UBUNTU.txt
@@ -44,16 +44,14 @@
4) Install pure-ftpd and quota
+First we have to make sure that the capability module is loaded in the kernel
+
+modprobe capability
+echo 'capability' >> /etc/modules
+
+Then we install pureftpd and quota.
+
apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
-
-Edit the file /etc/default/pure-ftpd-common
-
-vi /etc/default/pure-ftpd-common
-
-and change the start mode from inetd to standalone. Then execute:
-
-/etc/init.d/openbsd-inetd restart
-
5) Install mydns
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 923f094..7e81b6d 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -66,11 +66,11 @@
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");
}
}
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index fcb8c85..22d8ab4 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -488,6 +488,8 @@
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");
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 17cb382..04cb3c9 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -814,7 +814,7 @@
-- Daten f�r 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);
-- --------------------------------------------------------
--
Gitblit v1.9.1