From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).

---
 install/install.php |  549 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 449 insertions(+), 100 deletions(-)

diff --git a/install/install.php b/install/install.php
index 8384d41..3f86370 100644
--- a/install/install.php
+++ b/install/install.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -32,19 +32,16 @@
 	ISPConfig 3 installer.
 */
 
-//** Check for existing installation
-//if(is_dir("/usr/local/ispconfig")) die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
-
 error_reporting(E_ALL|E_STRICT);
 
 //** The banner on the command line
 echo "\n\n".str_repeat('-',80)."\n";
-echo " _____ ___________   _____              __ _       
-|_   _/  ___| ___ \ /  __ \            / _(_)      
-  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _ 
-  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |
- _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| |
- \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, |
+echo " _____ ___________   _____              __ _         ____
+|_   _/  ___| ___ \ /  __ \            / _(_)       /__  \
+  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _    _/ /
+  | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |  |_ |
+ _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| | ___\ \
+ \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, | \____/
                                               __/ |
                                              |___/ ";
 echo "\n".str_repeat('-',80)."\n";
@@ -56,17 +53,30 @@
 //** Include the base class of the installer class
 require_once('lib/installer_base.lib.php');
 
-//** Get distribution identifier
-$distname = get_distname();
-
-if($distname == '') die('Linux Dustribution or Version not recognized.');
-
-//** Include the distribution specific installer class library and configuration
-include_once('dist/lib/'.$distname.'.lib.php');
-include_once('dist/conf/'.$distname.'.conf.php');
+//** Ensure that current working directory is install directory
+$cur_dir = getcwd();
+if(realpath(dirname(__FILE__)) != $cur_dir) {
+	chdir( realpath(dirname(__FILE__)) );
+}
 
 //** Install logfile
 define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
+define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
+
+//** Check for existing installation
+/*if(is_dir("/usr/local/ispconfig")) {
+    die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
+}*/
+
+//** Get distribution identifier
+$dist = get_distname();
+
+if($dist['id'] == '') die('Linux distribution or version not recognized.');
+
+//** Include the distribution-specific installer class library and configuration
+if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
+include_once('dist/lib/'.$dist['id'].'.lib.php');
+include_once('dist/conf/'.$dist['id'].'.conf.php');
 
 //****************************************************************************************************
 //** Installer Interface 
@@ -78,21 +88,39 @@
 
 //** Check log file is writable (probably not root or sudo)
 if(!is_writable(dirname(ISPC_LOG_FILE))){
-    die("ERROR: Cannot write to the directory ".dirname(ISPC_LOG_FILE).". Are you root or sudo ?\n\n");
+    die("ERROR: Cannot write to the ".dirname(ISPC_LOG_FILE)." directory. Are you root or sudo ?\n\n");
 }
 
-//** Select the language
+if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
+	die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
+}
+
+if(is_dir('/usr/local/ispconfig')) {
+	die('ISPConfig 3 installation found. Please use update.php instead if install.php to update the installation.');
+}
+
+//** Detect the installed applications
+$inst->find_installed_apps();
+
+//** Select the language and set default timezone
 $conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
 
+exec('date +%Z', $tmp_out);
+$conf['timezone'] = $tmp_out[0];
+unset($tmp_out);
+
 //** Select installation mode
-$install_mode = $inst->simple_query('Installation mode', array('Standard','Expert'), 'Standard');
+$install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
 
 
 //** Get the hostname
 $tmp_out = array();
 exec('hostname -f', $tmp_out);
-$inst->conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
+$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0]);
 unset($tmp_out);
+
+// Check if the mysql functions are loaded in PHP
+if(!function_exists('mysql_connect')) die('No PHP MySQL functions available. Please ensure that the PHP MySQL module is loaded.');
 
 //** Get MySQL root credentials
 $finished = false;
@@ -100,45 +128,85 @@
 	$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
 	$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
 	$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
-    $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
+	$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
+	$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
+	
+	if($install_mode == 'expert') {
+		swriteln("The next two questions are about the internal ISPConfig database user and password.\nIt is recommended to accept the defaults which are 'ispconfig' as username and a random password.\nIf you use a different password, use only numbers and chars for the password.\n");
+		$conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user']);
+		$conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password']);
+	}
 	
 	//* Initialize the MySQL server connection
 	if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
 		$conf['mysql']['host'] = $tmp_mysql_server_host;
 		$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
 		$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
-        $conf['mysql']['database'] = $tmp_mysql_server_database;
+		$conf['mysql']['database'] = $tmp_mysql_server_database;
+		$conf['mysql']['charset'] = $tmp_mysql_server_charset;
 		$finished = true;
 	} else {
-		swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
+		swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysql_error());
 	}
 } while ($finished == false);
 unset($finished);
 
-//** initializing database connection
+// Resolve the IP address of the MySQL hostname.
+$tmp = explode(':',$conf['mysql']['host']);
+if(!$conf['mysql']['ip'] = gethostbyname($tmp[0])) die('Unable to resolve hostname'.$tmp[0]);
+unset($tmp);
+
+
+//** Initializing database connection
 include_once('lib/mysql.lib.php');
 $inst->db = new db();
 
 //** Begin with standard or expert installation
-if($install_mode == 'Standard') {
+if($install_mode == 'standard') {
 	
-	//* Create the mysql database
+	//* Create the MySQL database
 	$inst->configure_database();
+	
+	//* Configure Webserver - Apache or nginx
+	if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
+		$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
+		if($http_server_to_use == 'apache'){
+			$conf['nginx']['installed'] = false;
+		} else {
+			$conf['apache']['installed'] = false;
+		}
+	}
+	
+	//* Insert the Server record into the database
+	$inst->add_database_server_record();
 
-	//* Configure postfix
+	//* Configure Postfix
 	$inst->configure_postfix();
+	
+	//* Configure Mailman
+	$inst->configure_mailman('install');
+	
+	//* Configure jailkit
+	swriteln('Configuring Jailkit');
+	$inst->configure_jailkit();
+	
+	if($conf['dovecot']['installed'] == true) {
+		//* Configure Dovecot
+		swriteln('Configuring Dovecot');
+		$inst->configure_dovecot();
+	} else {
+		//* Configure saslauthd
+		swriteln('Configuring SASL');
+		$inst->configure_saslauthd();
 
-	//* Configure saslauthd
-	swriteln('Configuring SASL');
-	$inst->configure_saslauthd();
-
-	//* Configure PAM
-	swriteln('Configuring PAM');
-	$inst->configure_pam();
-
-	//* Configure courier
-	swriteln('Configuring Courier');
-	$inst->configure_courier();
+		//* Configure PAM
+		swriteln('Configuring PAM');
+		$inst->configure_pam();
+		
+		//* Configure Courier
+		swriteln('Configuring Courier');
+		$inst->configure_courier();
+	}
 
 	//* Configure Spamasassin
 	swriteln('Configuring Spamassassin');
@@ -152,66 +220,216 @@
 	swriteln('Configuring Getmail');
 	$inst->configure_getmail();
 	
-
 	//* Configure Pureftpd
 	swriteln('Configuring Pureftpd');
 	$inst->configure_pureftpd();
 
-	//* Configure MyDNS
-	swriteln('Configuring MyDNS');
-	$inst->configure_mydns();
+	//* Configure DNS
+	if($conf['powerdns']['installed'] == true) {
+		swriteln('Configuring PowerDNS');
+		$inst->configure_powerdns();
+	} elseif($conf['bind']['installed'] == true) {
+		swriteln('Configuring BIND');
+		$inst->configure_bind();
+	} else {
+		swriteln('Configuring MyDNS');
+		$inst->configure_mydns();
+	}
 	
 	//* Configure Apache
-	swriteln('Configuring Apache');
-	$inst->configure_apache();
+	if($conf['apache']['installed'] == true){
+		swriteln('Configuring Apache');
+		$inst->configure_apache();
+	}
+	
+	//* Configure nginx
+	if($conf['nginx']['installed'] == true){
+		swriteln('Configuring nginx');
+		$inst->configure_nginx();
+	}
+	
+    //** Configure Vlogger
+    swriteln('Configuring Vlogger');
+    $inst->configure_vlogger();
+	
+	//** Configure apps vhost
+	swriteln('Configuring Apps vhost');
+	$inst->configure_apps_vhost();
+    
+	//* Configure Firewall
+	//* Configure Bastille Firewall
+	$conf['services']['firewall'] = true;
+	swriteln('Configuring Bastille Firewall');
+	$inst->configure_firewall();
 
+    //* Configure Fail2ban
+    if($conf['fail2ban']['installed'] == true) {
+        swriteln('Configuring Fail2ban');
+        $inst->configure_fail2ban();
+    }
+	
+	/*
+	if($conf['squid']['installed'] == true) {
+		$conf['services']['proxy'] = true;
+		swriteln('Configuring Squid');
+		$inst->configure_squid();
+	} else if($conf['nginx']['installed'] == true) {
+		$conf['services']['proxy'] = true;
+		swriteln('Configuring Nginx');
+		$inst->configure_nginx();
+	}
+	*/
+	
 	//* Configure ISPConfig
 	swriteln('Installing ISPConfig');
+	
+	//** Customize the port ISPConfig runs on
+	$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
+	if($conf['apache']['installed'] == true) $conf['apache']['vhost_port']  = $ispconfig_vhost_port;
+	if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port']  = $ispconfig_vhost_port;
+	unset($ispconfig_vhost_port);
+
+	if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
+	  $inst->make_ispconfig_ssl_cert();
+	}
+
 	$inst->install_ispconfig();
+	
+	//* Configure DBServer
+	swriteln('Configuring DBServer');
+	$inst->configure_dbserver();
 
 	//* Configure ISPConfig
-	swriteln('Installing Crontab');
+	swriteln('Installing ISPConfig crontab');
 	$inst->install_crontab();
 	
 	swriteln('Restarting services ...');
-	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');
-	
+	if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))					system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
+	if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+	if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+	if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))					system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+	if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))					system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+	if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+	if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) 			system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+	if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) 	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+	if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) 				system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+	if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) 		system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+	if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) 		system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
+	if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) 		system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
+	if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script'])) 				system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+	//* Reload is enough for nginx
+	if($conf['nginx']['installed'] == true){
+		if($conf['nginx']['php_fpm_init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'].' reload');
+		if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) 				system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
+	}
+	if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))				system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+	if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+	if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))					system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
+	if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))					system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
+	//if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script']))					system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
+	if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script']))					system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
+	//if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script']))					system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
 }else{
-
-	//** Get Server ID
-	$conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
 	
-	if(strtolower($inst->simple_query('Create Database',array('y','n'),'y')) == 'y') {
-		//* Create the mysql database
-		$inst->configure_database();
-		system('/etc/init.d/mysql restart');
+	//* In expert mode, we select the services in the following steps, only db is always available
+	$conf['services']['mail'] = false;
+	$conf['services']['web'] = false;
+	$conf['services']['dns'] = false;
+	$conf['services']['db'] = true;
+	$conf['services']['firewall'] = false;
+	$conf['services']['proxy'] = false;
+	
+	
+	//** Get Server ID
+	// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
+	// Server ID is an autoInc value of the mysql database now
+	
+	if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup',array('y','n'),'n')) == 'y') {
+		$conf['mysql']['master_slave_setup'] = 'y';
+		
+		//** Get MySQL root credentials
+		$finished = false;
+		do {
+			$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
+			$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
+			$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
+    		$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
+	
+			//* Initialize the MySQL server connection
+			if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
+				$conf['mysql']['master_host'] = $tmp_mysql_server_host;
+				$conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
+				$conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
+				$conf['mysql']['master_database'] = $tmp_mysql_server_database;
+				$finished = true;
+			} else {
+				swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
+			}
+		} while ($finished == false);
+		unset($finished);
+		
+		// initialize the connection to the master database
+		$inst->dbmaster = new db();
+		if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
+		$inst->dbmaster->dbHost = $conf['mysql']["master_host"];
+		$inst->dbmaster->dbName = $conf['mysql']["master_database"];
+		$inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
+		$inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
+		
+	} else {
+		// the master DB is the same then the slave DB
+		$inst->dbmaster = $inst->db;
 	}
 	
+	//* Create the mysql database
+	$inst->configure_database();
+	
+	//* Configure Webserver - Apache or nginx
+	if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
+		$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
+		if($http_server_to_use == 'apache'){
+			$conf['nginx']['installed'] = false;
+		} else {
+			$conf['apache']['installed'] = false;
+		}
+	}
+		
+	//* Insert the Server record into the database
+	swriteln('Adding ISPConfig server record to database.');
+	swriteln('');
+	$inst->add_database_server_record();
+
+	
 	if(strtolower($inst->simple_query('Configure Mail', array('y','n') ,'y') ) == 'y') {
+		
+		$conf['services']['mail'] = true;
 		
 		//* Configure Postfix
 		swriteln('Configuring Postfix');
 		$inst->configure_postfix();
 		
-		//* Configure PAM
-		swriteln('Configuring PAM');
-		$inst->configure_pam();
+		//* Configure Mailman
+		swriteln('Configuring Mailman');
+		$inst->configure_mailman();
 
-		//* Configure courier
-		swriteln('Configuring Courier');
-		$inst->configure_courier();
+		if($conf['dovecot']['installed'] == true) {
+			//* Configure dovecot
+			swriteln('Configuring Dovecot');
+			$inst->configure_dovecot();
+		} else {
+		
+			//* Configure saslauthd
+			swriteln('Configuring SASL');
+			$inst->configure_saslauthd();
+		
+			//* Configure PAM
+			swriteln('Configuring PAM');
+			$inst->configure_pam();
+			
+			//* Configure courier
+			swriteln('Configuring Courier');
+			$inst->configure_courier();
+		}
 
 		//* Configure Spamasassin
 		swriteln('Configuring Spamassassin');
@@ -225,48 +443,179 @@
 		swriteln('Configuring Getmail');
 		$inst->configure_getmail();
 		
-		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');
+		if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))				system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
+		if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))			system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
+		if($conf['amavis']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['amavis']['init_script']))					system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
+		if($conf['clamav']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['clamav']['init_script']))					system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
+		if($conf['courier']['courier-authdaemon'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
+		if($conf['courier']['courier-imap'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap'])) 			system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
+		if($conf['courier']['courier-imap-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) 	system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
+		if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) 				system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
+		if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) 		system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
+		if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) 		system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
+		if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script'])) 		system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
+	}
+	
+	//** Configure Jailkit
+	if(strtolower($inst->simple_query('Configure Jailkit', array('y','n'),'y') ) == 'y') {	
+		swriteln('Configuring Jailkit');
+		$inst->configure_jailkit();
 	}
 	
 	//** Configure Pureftpd
 	if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {	
 		swriteln('Configuring Pureftpd');
 		$inst->configure_pureftpd();
-		system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
+		if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
 	}
 	
-	//** Configure MyDNS
+	//** Configure DNS
 	if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
-		swriteln('Configuring MyDNS');
-		$inst->configure_mydns();
-		system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
+		$conf['services']['dns'] = true;
+		//* Configure DNS
+		if($conf['powerdns']['installed'] == true) {
+			swriteln('Configuring PowerDNS');
+			$inst->configure_powerdns();
+			if($conf['powerdns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['powerdns']['init_script']))					system($conf['init_scripts'].'/'.$conf['powerdns']['init_script'].' restart &> /dev/null');
+		} elseif($conf['bind']['installed'] == true) {
+			swriteln('Configuring BIND');
+			$inst->configure_bind();
+			if($conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script']))					system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
+		} else {
+			swriteln('Configuring MyDNS');
+			$inst->configure_mydns();
+			if($conf['mydns']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
+		}
+		
 	}
+	
+	/*
+	//** Configure Squid
+	if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') {	
+		if($conf['squid']['installed'] == true) {
+			$conf['services']['proxy'] = true;
+			swriteln('Configuring Squid');
+			$inst->configure_squid();
+			if($conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script']))system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
+		} else if($conf['nginx']['installed'] == true) {
+			$conf['services']['proxy'] = true;
+			swriteln('Configuring Nginx');
+			$inst->configure_nginx();
+			if($conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
+		}
+	}
+	*/
 	
 	//** Configure Apache
-	if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {	
-		swriteln('Configuring Apache');
-		$inst->configure_apache();
+	if($conf['apache']['installed'] == true){
+		swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
+		if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {	
+			$conf['services']['web'] = true;
+			swriteln('Configuring Apache');
+			$inst->configure_apache();
+       
+			//** Configure Vlogger
+			swriteln('Configuring Vlogger');
+			$inst->configure_vlogger();
+	
+			//** Configure apps vhost
+			swriteln('Configuring Apps vhost');
+			$inst->configure_apps_vhost();
+		}
 	}
 	
-	//** Configure ISPConfig :-)
-	if(strtolower($inst->simple_query('Install ISPConfig',array('y','n'),'y')) == 'y') {
-		swriteln('Installing ISPConfig');
-		$inst->install_ispconfig();
-		
-		//* Configure ISPConfig
-		swriteln('Installing Crontab');
-		$inst->install_crontab();
-		system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');	
+	//** Configure nginx
+	if($conf['nginx']['installed'] == true){
+		swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure nginx Server' option.\n");
+		if(strtolower($inst->simple_query('Configure nginx Server',array('y','n'),'y')) == 'y') {	
+			$conf['services']['web'] = true;
+			swriteln('Configuring nginx');
+			$inst->configure_nginx();
+       
+			//** Configure Vlogger
+			//swriteln('Configuring Vlogger');
+			//$inst->configure_vlogger();
+	
+			//** Configure apps vhost
+			swriteln('Configuring Apps vhost');
+			$inst->configure_apps_vhost();
+		}
 	}
 	
+	//** Configure Firewall
+	if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {	
+		//if($conf['bastille']['installed'] == true) {
+			//* Configure Bastille Firewall
+			$conf['services']['firewall'] = true;
+			swriteln('Configuring Bastille Firewall');
+			$inst->configure_firewall();
+		/*} elseif($conf['ufw']['installed'] == true) {
+			//* Configure Ubuntu Firewall
+			$conf['services']['firewall'] = true;
+			swriteln('Configuring Ubuntu Firewall');
+			$inst->configure_ufw_firewall();
+		}
+		*/
+	}
+	
+	//** Configure Firewall
+	/*if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {	
+		swriteln('Configuring Firewall');
+		$inst->configure_firewall();
+	}*/
+	
+	//** Configure ISPConfig :-)
+	if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') {
+		swriteln('Installing ISPConfig');
+		
+		//** We want to check if the server is a module or cgi based php enabled server
+		//** TODO: Don't always ask for this somehow ?
+		/*
+		$fast_cgi = $inst->simple_query('CGI PHP Enabled Server?', array('yes','no'),'no');
+
+		if($fast_cgi == 'yes') {
+	 		$alias = $inst->free_query('Script Alias', '/php/');
+	 		$path = $inst->free_query('Script Alias Path', '/path/to/cgi/bin');
+	 		$conf['apache']['vhost_cgi_alias'] = sprintf('ScriptAlias %s %s', $alias, $path);
+		} else {
+	 		$conf['apache']['vhost_cgi_alias'] = "";
+		}
+		*/
+
+		//** Customise the port ISPConfig runs on
+		$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
+		if($conf['apache']['installed'] == true) $conf['apache']['vhost_port']  = $ispconfig_vhost_port;
+		if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port']  = $ispconfig_vhost_port;
+		unset($ispconfig_vhost_port);
+		
+		if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface',array('y','n'),'y')) == 'y') {
+			$inst->make_ispconfig_ssl_cert();
+		}
+		
+		$inst->install_ispconfig_interface = true;
+			
+	} else {
+		$inst->install_ispconfig_interface = false;
+	}
+	
+	$inst->install_ispconfig();
+	
+	//* Configure DBServer
+	swriteln('Configuring DBServer');
+	$inst->configure_dbserver();
+		
+	//* Configure ISPConfig
+	swriteln('Installing ISPConfig crontab');
+	$inst->install_crontab();
+	if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
+	//* Reload is enough for nginx
+	if($conf['nginx']['installed'] == true){
+		if($conf['nginx']['php_fpm_init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['php_fpm_init_script'].' reload');
+		if($conf['nginx']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
+	}
+	
+	
+	
 } //* << $install_mode / 'Standard' or Genius
 
 

--
Gitblit v1.9.1