Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/core/modules/modSyslog.class.php
This commit is contained in:
Laurent Destailleur
2018-10-30 15:32:09 +01:00
6 changed files with 35 additions and 22 deletions

View File

@@ -85,20 +85,20 @@ class modSyslog extends DolibarrModules
// Cronjobs
$this->cronjobs = array(
0 => array(
'label' => 'CompressSyslogs',
'jobtype' => 'method',
'class' => 'core/class/utils.class.php',
'objectname' => 'Utils',
'method' => 'compressSyslogs',
'parameters' => '',
'comment' => 'Compress and archive log files. Warning: batch must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group',
'frequency' => 1,
'unitfrequency' => 3600 * 24,
'priority' => 50,
'status' => 0,
'test' => true,
),
0 => array(
'label' => 'CompressSyslogs',
'jobtype' => 'method',
'class' => 'core/class/utils.class.php',
'objectname' => 'Utils',
'method' => 'compressSyslogs',
'parameters' => '',
'comment' => 'Compress and archive log files. Warning: batch must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group',
'frequency' => 1,
'unitfrequency' => 3600 * 24,
'priority' => 50,
'status' => 0,
'test' => true
)
);
}
}