mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:20 +01:00
* Package install/update: no more limit memory as backup might fail, do not run backup for single apps
This commit is contained in:
parent
dbf69a79c6
commit
b345ea6c31
@ -251,7 +251,8 @@ foreach(array('php','source_dir','data_dir','setup-cli') as $name)
|
|||||||
// fix important php.ini and conf.d/*.ini settings
|
// fix important php.ini and conf.d/*.ini settings
|
||||||
check_fix_php_apc_ini();
|
check_fix_php_apc_ini();
|
||||||
|
|
||||||
$setup_cli = $config['php'].' -d memory_limit=256M '.$config['setup-cli'];
|
// not limiting memory, as backups might fail with limit we set
|
||||||
|
$setup_cli = $config['php'].' -d memory_limit=-1 '.$config['setup-cli'];
|
||||||
|
|
||||||
if (!file_exists($config['header']) || filesize($config['header']) < 200) // default header redirecting to setup is 147 bytes
|
if (!file_exists($config['header']) || filesize($config['header']) < 200) // default header redirecting to setup is 147 bytes
|
||||||
{
|
{
|
||||||
@ -398,8 +399,9 @@ else
|
|||||||
patch_header($config['header'], $config['config_user'], $old_password);
|
patch_header($config['header'], $config['config_user'], $old_password);
|
||||||
});
|
});
|
||||||
|
|
||||||
// update egroupware
|
// update egroupware, or single app(s), in later case skip backup
|
||||||
$setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd'].',,'.$config['install-update-app']);
|
$setup_update = $setup_cli.' --update '.escapeshellarg('all,'.$config['config_user'].','.$config['config_passwd'].
|
||||||
|
(empty($config['install-update-app']) ? '' : ',no,'.$config['install-update-app']));
|
||||||
$ret = run_cmd($setup_update,$output,array(4,15));
|
$ret = run_cmd($setup_update,$output,array(4,15));
|
||||||
|
|
||||||
switch($ret)
|
switch($ret)
|
||||||
|
Loading…
Reference in New Issue
Block a user