From ba66cdbf4532870ef016c619f5bdec5ac26efe98 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 29 Oct 2007 18:22:20 -0400
Subject: [PATCH] - Fixed a big with stdin input in the installer - enhanced the documentation
---
INSTALL_DEBIAN.txt | 14 +++++++++++++-
install/lib/install.lib.php | 4 +---
INSTALL_UBUNTU.txt | 4 +++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/INSTALL_DEBIAN.txt b/INSTALL_DEBIAN.txt
index 243566b..d08a87d 100644
--- a/INSTALL_DEBIAN.txt
+++ b/INSTALL_DEBIAN.txt
@@ -18,7 +18,7 @@
2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
-apt-get install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip
+apt-get install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl
3) Install apache, PHP5 and phpmyadmin (1 line!):
@@ -94,3 +94,15 @@
password: admin
In case you get a permission denied error from apache, please restart the apache webserver process.
+
+----------------------------------------------------------------------------------------------------------
+
+Hints:
+
+debian 4.0 under openvz:
+
+VPSID=122
+for CAP in CHOWN DAC_READ_SEARCH SETGID SETUID NET_BIND_SERVICE NET_ADMIN SYS_CHROOT SYS_NICE CHOWN DAC_READ_SEARCH SETGID SETUID NET_BIND_SERVICE NET_ADMIN SYS_CHROOT SYS_NICE
+do
+ vzctl set $VPSID --capability ${CAP}:on --save
+done
diff --git a/INSTALL_UBUNTU.txt b/INSTALL_UBUNTU.txt
index b160864..765a3de 100644
--- a/INSTALL_UBUNTU.txt
+++ b/INSTALL_UBUNTU.txt
@@ -30,7 +30,7 @@
2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
-apt-get install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip
+apt-get install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl
3) Install apache, PHP5 and phpmyadmin (1 line!):
@@ -53,6 +53,8 @@
apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
+echo 'yes' > /etc/pure-ftpd/conf/DontResolve
+
5) Install mydns
apt-get install mydns-mysql
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 7e81b6d..b8f40f1 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -83,9 +83,7 @@
}
function sread() {
- $f = fopen('/dev/stdin', 'r');
- $input = fgets($f, 255);
- fclose($f);
+ $input = fgets(STDIN);
return rtrim($input);
}
--
Gitblit v1.9.1