Installation instructions updated. Fixed a fedora specific bug in update script.

Author: tbrehm

INSTALL_FEDORA_9.txt

@@ -149,8 +149,6 @@ There are two possile scenarios, but not both:
 7.1) Install the latest released version 
 7.2) Install directly from SVN
 
-apt-get install php5-cli
-
 8.1) Installation of beta 3 from tar.gz
 
   cd /tmp
@@ -160,7 +158,7 @@ apt-get install php5-cli
 
 8.2) Installation from SVN
 
-  apt-get install subversion
+  yum install subversion
   cd /tmp
   svn export svn://svn.ispconfig.org/ispconfig3/trunk/
   cd trunk/install
@@ -187,17 +185,8 @@ Optional:
 
 Install a webbased FTP Client
 
-apt-get install squirrelmail
-ln -s /usr/share/squirrelmail/ /var/www/webmail
-
-Access squirrelmail:
-
-http://192.168.0.100/webmail
-
-
-To configure squirrelmail, run:
+yum install squirrelmail
 
-/usr/sbin/squirrelmail-configure
 
 ----------------------------------------------------------------------------------------------------------
 
@@ -215,7 +204,6 @@ done
 
 Installing Jailkit:
 
-apt-get install build-essential autoconf automake1.9 libtool flex bison
 cd /tmp
 wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
 tar xvfz jailkit-2.5.tar.gz

INSTALL_OPENSUSE_11.txt

@@ -135,8 +135,6 @@ There are two possile scenarios, but not both:
 7.1) Install the latest released version 
 7.2) Install directly from SVN
 
-apt-get install php5-cli
-
 7.1) Installation of beta 3 from tar.gz
 
   cd /tmp
@@ -146,7 +144,7 @@ apt-get install php5-cli
 
 7.2) Installation from SVN
 
-  apt-get install subversion
+  yast2 -i subversion
   cd /tmp
   svn export svn://svn.ispconfig.org/ispconfig3/trunk/
   cd trunk/install
@@ -173,17 +171,7 @@ Optional:
 
 Install a webbased FTP Client
 
-apt-get install squirrelmail
-ln -s /usr/share/squirrelmail/ /var/www/webmail
-
-Access squirrelmail:
-
-http://192.168.0.100/webmail
-
-
-To configure squirrelmail, run:
-
-/usr/sbin/squirrelmail-configure
+yast2 -i squirrelmail
 
 ----------------------------------------------------------------------------------------------------------
 
@@ -201,7 +189,6 @@ done
 
 Installing Jailkit:
 
-apt-get install build-essential autoconf automake1.9 libtool flex bison
 cd /tmp
 wget http://olivier.sessink.nl/jailkit/jailkit-2.5.tar.gz
 tar xvfz jailkit-2.5.tar.gz

install/update.php

@@ -237,19 +237,19 @@
 //** Restart services:
 if($reconfigure_services_answer == 'yes') {
 	swriteln('Restarting services ...');
-	system("/etc/init.d/mysql restart");
-	system("/etc/init.d/postfix restart");
-	system("/etc/init.d/saslauthd restart");
-	system("/etc/init.d/amavis restart");
-	system("/etc/init.d/clamav-daemon restart");
-	system("/etc/init.d/courier-authdaemon restart");
-	system("/etc/init.d/courier-imap restart");
-	system("/etc/init.d/courier-imap-ssl restart");
-	system("/etc/init.d/courier-pop restart");
-	system("/etc/init.d/courier-pop-ssl restart");
-	system("/etc/init.d/apache2 restart");
-	system("/etc/init.d/pure-ftpd-mysql restart");
-	system("/etc/init.d/mydns restart &> /dev/null");
+	system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+	system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+	system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+	system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+	system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
 }
 
 echo "Update finished.\n";