diff --git a/install/autoupdate.php b/install/autoupdate.php index 7ab617d113f2dbeaa74a451c6f19dc394d5bde6e..0c5c0270422986c4277efb4c4581d0212cfa64c7 100644 --- a/install/autoupdate.php +++ b/install/autoupdate.php @@ -73,6 +73,10 @@ define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //** Get distribution identifier $dist = get_distname(); +include_once("/usr/local/ispconfig/server/lib/config.inc.php"); +$conf_old = $conf; +unset($conf); + if($dist['id'] == '') die('Linux Dustribution or Version not recognized.'); //** Include the distribution specific installer class library and configuration @@ -80,10 +84,6 @@ if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$di include_once('dist/lib/'.$dist['id'].'.lib.php'); include_once('dist/conf/'.$dist['id'].'.conf.php'); -include_once("/usr/local/ispconfig/server/lib/config.inc.php"); -$conf_old = $conf; -unset($conf); - //** Get hostname exec('hostname -f', $tmp_out); $conf['hostname'] = $tmp_out[0]; @@ -158,7 +158,6 @@ $inst->db = new db(); if($conf['mysql']['master_slave_setup'] != 'y') { $inst->dbmaster = $inst->db; $inst->grant_master_database_rights(); -echo "done rights"; } /*