Commit 64f3d750 authored by tbrehm's avatar tbrehm
Browse files

- Bugfix in DNS template wizard

- Removed unused code in server.php
- Commented out FcgidMaxProcesses in vhost template 
parent 5cff6bc5
......@@ -79,10 +79,6 @@ unset($conf);
if($dist['id'] == '') die('Linux distribution or version not recognized.');
//** Check version
// if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) < 0) die("This updater is for ISPConfig versions > 3.0.3.0. Please Update to ISPConfig 3.0.3.3 first before you update to the current ISPConfig version.\n");
//** 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');
......@@ -160,7 +156,6 @@ prepareDBDump();
//* initialize the database
$inst->db = new db();
// $inst->db->dbName = $conf["mysql"]["database"];
/*
* The next line is a bit tricky!
......
......@@ -78,9 +78,6 @@ unset($conf);
if($dist['id'] == '') die('Linux distribution or version not recognized.');
//** Check version
// if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) < 0) die("This updater is for ISPConfig versions > 3.0.3.0. Please Update to ISPConfig 3.0.3.3 first before you update to the current ISPConfig version.\n");
//** 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');
......@@ -155,7 +152,6 @@ prepareDBDump();
//* initialize the database
$inst->db = new db();
// $inst->db->dbName = $conf["mysql"]["database"];
//* initialize the master DB, if we have a multiserver setup
if($conf['mysql']['master_slave_setup'] == 'y') {
......
......@@ -11,7 +11,7 @@
<fieldset class="inlineLabels"><legend>DNS Zone</legend>
<div class="ctrlHolder">
<label for="template_id">{tmpl_var name='template_id_txt'}</label>
<select name="template_id" id="template_id" class="selectInput">
<select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
{tmpl_var name='template_id_option'}
</select>
</div>
......
......@@ -176,7 +176,7 @@
<tmpl_if name='fastcgi_config_syntax' op='==' value='2'>
FcgidIdleTimeout 300
FcgidProcessLifeTime 3600
FcgidMaxProcesses 1000
# FcgidMaxProcesses 1000
FcgidMinProcessesPerClass 0
FcgidMaxProcessesPerClass 100
FcgidConnectTimeout 3
......
......@@ -37,19 +37,6 @@ ini_set('error_reporting', E_ALL & ~E_NOTICE);
// make sure server_id is always an int
$conf['server_id'] = intval($conf['server_id']);
/*
// Get server record, if updates where available for this server
$server_db_record = $app->db->queryOneRecord("SELECT * FROM server WHERE update = 1 AND server_id = ".$conf['server_id']);
if($server_db_record == false) {
$app->log('Nothing to update for server_id '.$conf['server_id']);
die();
} else {
// Set update status to 0, so we dont start the update process twice
$app->db->query("UPDATE server SET update = 0 WHERE server_id = ".$conf['server_id']);
$app->log('Begin update.');
}
*/
/*
* Try to Load the server configuration from the master-db
*/
......
Supports Markdown
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