From 2ce1583e0b72b221257633c37271890018e2651c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 15 Feb 2009 08:01:33 -0500
Subject: [PATCH] Updated installation instructions Fixed a bug that prevented the restarting of services when the install is finished.

---
 INSTALL_UBUNTU_8.10.txt |    4 +-
 INSTALL_DEBIAN_5.0.txt  |   27 ++++---------
 install/install.php     |   26 ++++++------
 INSTALL_OPENSUSE_11.txt |    4 +-
 INSTALL_UBUNTU_7.10.txt |    4 +-
 install/update.php      |   26 ++++++------
 INSTALL_DEBIAN_4.0.txt  |    4 +-
 INSTALL_FEDORA_9.txt    |    4 +-
 INSTALL_CENTOS_5.2.txt  |    4 +-
 INSTALL_UBUNTU_8.04.txt |    4 +-
 10 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/INSTALL_CENTOS_5.2.txt b/INSTALL_CENTOS_5.2.txt
index cc1afc8..8e0a344 100644
--- a/INSTALL_CENTOS_5.2.txt
+++ b/INSTALL_CENTOS_5.2.txt
@@ -174,8 +174,8 @@
 7.1) Installation of beta 3 from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-  tar xvfz ISPConfig-3.0.0.8-rc1.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+  tar xvfz ISPConfig-3.0.0.9-rc2.tar.gz
   cd ispconfig3_install/install/
 
 7.2) Installation from SVN
diff --git a/INSTALL_DEBIAN_4.0.txt b/INSTALL_DEBIAN_4.0.txt
index ede51f4..7ac2dc5 100644
--- a/INSTALL_DEBIAN_4.0.txt
+++ b/INSTALL_DEBIAN_4.0.txt
@@ -149,8 +149,8 @@
 9.1) Installation of last version from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-  tar xvfz ISPConfig-3.0.0.8-rc1.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+  tar xvfz ISPConfig-3.0.0.9-rc2.tar.gz
   cd ispconfig3_install/install/
 
 9.2) Installation from SVN
diff --git a/INSTALL_DEBIAN_LENNY.txt b/INSTALL_DEBIAN_5.0.txt
similarity index 93%
rename from INSTALL_DEBIAN_LENNY.txt
rename to INSTALL_DEBIAN_5.0.txt
index 4c9faac..5cddf6a 100644
--- a/INSTALL_DEBIAN_LENNY.txt
+++ b/INSTALL_DEBIAN_5.0.txt
@@ -65,14 +65,6 @@
 
 /etc/init.d/mysql restart
 
-# Set the mysql database password:
-# Again use your own domain name...
-
-mysqladmin -u root password yourrootsqlpassword
-mysqladmin -h ispconfig.local -u root password yourrootsqlpassword
-
-
-
 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 libnet-dns-perl
@@ -81,7 +73,7 @@
 
 3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
-apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt
+apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick
 
 
 # When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
@@ -117,11 +109,6 @@
        </Files>
 ------------------------------------------------------
 
-
-opt3.1) Optionally install some image manipulation capabilities to make advanced web designers happy
-
-apt-get install php5-imagick imagemagick
-
 # restart apache before continuing
 
 /etc/init.d/apache2 restart
@@ -131,7 +118,8 @@
 
 apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
 
-# Edit the file /etc/default/pure-ftpd-common to change the start mode from "inetd" to "standalone".
+# Edit the file /etc/default/pure-ftpd-common to change the start mode from "inetd" to "standalone"
+and set VIRTUALCHROOT=true
 
 vi /etc/default/pure-ftpd-common
 
@@ -151,8 +139,8 @@
 apt-get install g++ libc6 gcc gawk make texinfo libmysqlclient15-dev
 
 cd /tmp
-wget http://heanet.dl.sourceforge.net/sourceforge/mydns-ng/mydns-1.2.8.15.tar.gz
-tar xvfz mydns-1.2.8.15.tar.gz
+wget http://heanet.dl.sourceforge.net/sourceforge/mydns-ng/mydns-1.2.8.25.tar.gz
+tar xvfz mydns-1.2.8.25.tar.gz
 cd mydns-1.2.8
 ./configure
 make
@@ -242,6 +230,7 @@
 ./configure
 make
 make install
+cd ..
 rm -rf jailkit-2.5*
 
 8) Install fail2ban (optional but recomended, because the monitor tries to show the log)
@@ -258,8 +247,8 @@
 9.1) Installation of last version from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-  tar xvfz ISPConfig-3.0.0.8-rc1.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+  tar xvfz ISPConfig-3.0.0.9-rc2.tar.gz
   cd ispconfig3_install/install/
 
 9.2) Installation from SVN
diff --git a/INSTALL_FEDORA_9.txt b/INSTALL_FEDORA_9.txt
index 4c0f99d..fae13a6 100644
--- a/INSTALL_FEDORA_9.txt
+++ b/INSTALL_FEDORA_9.txt
@@ -156,8 +156,8 @@
 8.1) Installation of beta 3 from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-  tar xvfz ISPConfig-3.0.0.8-rc1.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+  tar xvfz ISPConfig-3.0.0.9-rc2.tar.gz
   cd ispconfig3_install/install/
 
 8.2) Installation from SVN
diff --git a/INSTALL_OPENSUSE_11.txt b/INSTALL_OPENSUSE_11.txt
index 2ccbeee..7924996 100644
--- a/INSTALL_OPENSUSE_11.txt
+++ b/INSTALL_OPENSUSE_11.txt
@@ -144,8 +144,8 @@
 7.1) Installation of beta 3 from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-  tar xvfz ISPConfig-3.0.0.8-rc1.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+  tar xvfz ISPConfig-3.0.0.9-rc2.tar.gz
   cd ispconfig3_install/install/
 
 7.2) Installation from SVN
diff --git a/INSTALL_UBUNTU_7.10.txt b/INSTALL_UBUNTU_7.10.txt
index d389914..2201902 100644
--- a/INSTALL_UBUNTU_7.10.txt
+++ b/INSTALL_UBUNTU_7.10.txt
@@ -81,8 +81,8 @@
 1) Installation of beta 3
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig_3.0.0.8-rc1.tar.gz
-  tar xvfz ISPConfig_3.0.0.8-rc1.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig_3.0.0.9-rc2.tar.gz
+  tar xvfz ISPConfig_3.0.0.9-rc2.tar.gz
   cd ispconfig3_install/install/
 
 2) Installation from SVN
diff --git a/INSTALL_UBUNTU_8.04.txt b/INSTALL_UBUNTU_8.04.txt
index 69f9c8a..4bedb14 100644
--- a/INSTALL_UBUNTU_8.04.txt
+++ b/INSTALL_UBUNTU_8.04.txt
@@ -251,8 +251,8 @@
 a) Installation of beta 3
 ___
 cd /tmp
-wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-tar xvfz ISPConfig_3.0.0.8-rc1.tar.gz
+wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+tar xvfz ISPConfig_3.0.0.9-rc2.tar.gz
 cd ispconfig3_install/install/
 ___
 
diff --git a/INSTALL_UBUNTU_8.10.txt b/INSTALL_UBUNTU_8.10.txt
index 96a932d..f6896ea 100644
--- a/INSTALL_UBUNTU_8.10.txt
+++ b/INSTALL_UBUNTU_8.10.txt
@@ -253,8 +253,8 @@
 a) Installation of beta 3
 ___
 cd /tmp
-wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.8-rc1.tar.gz
-tar xvfz ISPConfig_3.0.0.8-rc1.tar.gz
+wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
+tar xvfz ISPConfig_3.0.0.9-rc2.tar.gz
 cd ispconfig3_install/install/
 ___
 
diff --git a/install/install.php b/install/install.php
index fb0de08..2e1472c 100644
--- a/install/install.php
+++ b/install/install.php
@@ -210,19 +210,19 @@
 	$inst->install_crontab();
 	
 	swriteln('Restarting services ...');
-	if($conf['mysql']['init_script'] != '' && is_file($conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
-	if($conf['postfix']['init_script'] != '' && is_file($conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
-	if($conf['saslauthd']['init_script'] != '' && is_file($conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
-	if($conf['amavis']['init_script'] != '' && is_file($conf['amavis']['init_script']))					system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
-	if($conf['clamav']['init_script'] != '' && is_file($conf['clamav']['init_script']))					system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
-	if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
-	if($conf['courier']['courier-imap'] != '' && is_file($conf['courier']['courier-imap'])) 			system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
-	if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['courier']['courier-imap-ssl'])) 	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
-	if($conf['courier']['courier-pop'] != '' && is_file($conf['courier']['courier-pop'])) 				system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
-	if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['courier']['courier-pop-ssl'])) 		system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
-	if($conf['apache']['init_script'] != '' && is_file($conf['apache']['init_script'])) 				system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
-	if($conf['pureftpd']['init_script'] != '' && is_file($conf['pureftpd']['init_script']))				system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
-	if($conf['mydns']['init_script'] != '' && is_file($conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+	if($conf['mysql']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+	if($conf['postfix']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+	if($conf['saslauthd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+	if($conf['amavis']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['amavis']['init_script']))					system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+	if($conf['clamav']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['clamav']['init_script']))					system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+	if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+	if($conf['courier']['courier-imap'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) 			system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+	if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) 	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+	if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) 				system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+	if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) 		system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+	if($conf['apache']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) 				system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+	if($conf['pureftpd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))				system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+	if($conf['mydns']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
 	
 }else{
 	
diff --git a/install/update.php b/install/update.php
index caca060..496f16f 100644
--- a/install/update.php
+++ b/install/update.php
@@ -316,24 +316,24 @@
 //** Restart services:
 if($reconfigure_services_answer == 'yes') {
 	swriteln('Restarting services ...');
-	if($conf['mysql']['init_script'] != '' && is_file($conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+	if($conf['mysql']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
 	if($conf['services']['mail']) {
-		if($conf['postfix']['init_script'] != '' && is_file($conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
-		if($conf['saslauthd']['init_script'] != '' && is_file($conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
-		if($conf['amavis']['init_script'] != '' && is_file($conf['amavis']['init_script']))					system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
-		if($conf['clamav']['init_script'] != '' && is_file($conf['clamav']['init_script']))					system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
-		if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
-		if($conf['courier']['courier-imap'] != '' && is_file($conf['courier']['courier-imap'])) 			system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
-		if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['courier']['courier-imap-ssl'])) 	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
-		if($conf['courier']['courier-pop'] != '' && is_file($conf['courier']['courier-pop'])) 				system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
-		if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['courier']['courier-pop-ssl'])) 		system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+		if($conf['postfix']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+		if($conf['saslauthd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+		if($conf['amavis']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['amavis']['init_script']))					system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+		if($conf['clamav']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['clamav']['init_script']))					system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+		if($conf['courier']['courier-authdaemon'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+		if($conf['courier']['courier-imap'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) 			system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+		if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) 	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+		if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) 				system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+		if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) 		system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
 	}
 	if($conf['services']['web']) {
-		if($conf['apache']['init_script'] != '' && is_file($conf['apache']['init_script'])) 				system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
-		if($conf['pureftpd']['init_script'] != '' && is_file($conf['pureftpd']['init_script']))				system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+		if($conf['apache']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) 				system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+		if($conf['pureftpd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))				system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
 	}
 	if($conf['services']['dns']) {
-		if($conf['mydns']['init_script'] != '' && is_file($conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+		if($conf['mydns']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
 	}
 }
 

--
Gitblit v1.9.1