Commit df0089f3 authored by mcramer's avatar mcramer

- checking for correct working directory in install and update

- checking for running instance in server.php
parent 08669660
......@@ -53,6 +53,10 @@ require_once('lib/install.lib.php');
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
//** Ensure that current working directory is install directory
$cur_dir = getcwd();
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__).'/../'));
......
......@@ -53,6 +53,10 @@ require_once('lib/install.lib.php');
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');
//** Ensure that current working directory is install directory
$cur_dir = getcwd();
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__).'/../'));
......
......@@ -56,6 +56,11 @@ if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
clearstatcache();
for($i=0;$i<1200;$i++){ // Wait max. 1200 sec, then proceed
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
exec("ps aux | grep '/usr/local/ispconfig/server/server.php' | grep -v 'grep' | wc -l", $check);
if(intval($check[0]) > 1) { // 1 because this is 2nd instance!
$app->log("There is already an instance of server.php running. Exiting.", LOGLEVEL_DEBUG);
exit;
}
$app->log("There is already a lockfile set. Waiting another 10 seconds...", LOGLEVEL_DEBUG);
sleep(10);
clearstatcache();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment