Move install.log into the ispconfig_log_dir

Author: helmo

install/install.php

@@ -85,8 +85,6 @@
 	chdir( realpath(dirname(__FILE__)) );
 }
 
-//** Install logfile
-define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
 define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
 
 //** Include the templating lib
@@ -155,9 +153,9 @@
 swriteln($inst->lng('    Default values are in [brackets] and can be accepted with <ENTER>.'));
 swriteln($inst->lng('    Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));
 
-//** Check log file is writable (probably not root or sudo)
-if(!is_writable(dirname(ISPC_LOG_FILE))){
-	die("ERROR: Cannot write to the ".dirname(ISPC_LOG_FILE)." directory. Are you root or sudo ?\n\n");
+//** Check install dir is writable (probably not root or sudo)
+if(!is_writable(dirname('/usr/local/ispconfig'))){
+	die("ERROR: Cannot write to the /usr/local/ispconfig directory. Are you root or sudo ?\n\n");
 }
 
 //** Check for ISPConfig 2.x versions
@@ -304,6 +302,11 @@
 	$inst->dbmaster = $inst->db;
 }
 
+if(!is_dir($conf['ispconfig_log_dir'])) {
+	mkdir($conf['ispconfig_log_dir'], 0755, true);
+}
+define('ISPC_LOG_FILE', $conf['ispconfig_log_dir'] . '/install.log');
+
 //* Create the mysql database
 $inst->configure_database();
 

install/lib/installer_base.lib.php

@@ -2982,9 +2982,6 @@ public function make_ispconfig_ssl_cert() {
 		}
 		swriteln('Using certificate path ' . $acme_cert_dir);
 
-		if(!is_dir($conf['ispconfig_log_dir'])) {
-			mkdir($conf['ispconfig_log_dir'], 0755, true);
-		}
 		$acme_log = $conf['ispconfig_log_dir'] . '/acme.log';
 
 		$ip_address_match = false;

install/update.php

@@ -88,7 +88,6 @@
 if(realpath(dirname(__FILE__)) != $cur_dir) die("Please run installation/update from _inside_ the install directory!\n");
 
 //** Install logfile
-define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
 define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
 
 //** Include the templating lib
@@ -112,6 +111,7 @@
 include_once "/usr/local/ispconfig/server/lib/config.inc.php";
 $conf_old = $conf;
 unset($conf);
+define('ISPC_LOG_FILE', $old_conf['ispconfig_log_dir'] . '/update.log');
 
 if($dist['id'] == '') die('Linux distribution or version not recognized.');