diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php
index 35ac4857..ad56665b 100644
--- a/actions/admin/settings/130.webserver.php
+++ b/actions/admin/settings/130.webserver.php
@@ -104,14 +104,26 @@ return array(
'save_method' => 'storeSettingField'
),
'system_logfiles_directory' => array(
- 'label' => (Settings::Get('system.webserver') != 'apache2') ? $lng['serversettings']['logfiles_directory'] : $lng['serversettings']['logfiles_directory2'],
+ 'label' => $lng['serversettings']['logfiles_directory'],
'settinggroup' => 'system',
'varname' => 'logfiles_directory',
'type' => 'string',
- 'string_type' => (Settings::Get('system.webserver') != 'apache2') ? 'dir' : '',
+ 'string_type' => 'dir',
'default' => '/var/customers/logs/',
'save_method' => 'storeSettingField'
),
+ 'system_logfiles_script' => array(
+ 'label' => $lng['serversettings']['logfiles_script'],
+ 'settinggroup' => 'system',
+ 'varname' => 'logfiles_script',
+ 'type' => 'string',
+ 'string_type' => '',
+ 'default' => '',
+ 'save_method' => 'storeSettingField',
+ 'websrv_avail' => array(
+ 'apache2'
+ )
+ ),
'system_logfiles_format' => array(
'label' => $lng['serversettings']['logfiles_format'],
'settinggroup' => 'system',
diff --git a/install/froxlor.sql b/install/froxlor.sql
index bda0e4d9..f39913fb 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -659,6 +659,7 @@ opcache.interned_strings_buffer'),
('system', 'logfiles_format', ''),
('system', 'logfiles_type', '1'),
('system', 'logfiles_piped', '0'),
+ ('system', 'logfiles_script', ''),
('panel', 'decimal_places', '4'),
('panel', 'adminmail', 'admin@SERVERNAME'),
('panel', 'phpmyadmin_url', ''),
@@ -691,7 +692,7 @@ opcache.interned_strings_buffer'),
('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''),
('panel', 'version', '0.9.39.5'),
- ('panel', 'db_version', '201805240');
+ ('panel', 'db_version', '201805241');
DROP TABLE IF EXISTS `panel_tasks`;
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index c1a9010e..e5e3c60e 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -3959,3 +3959,12 @@ if (isDatabaseVersion('201802250')) {
updateToDbVersion('201805240');
}
+
+if (isDatabaseVersion('201805240')) {
+
+ showUpdateStep("Adding webserver logfile-script settings");
+ Settings::AddNew("system.logfiles_script", '');
+ lastStepStatus(0);
+
+ updateToDbVersion('201805241');
+}
diff --git a/lib/version.inc.php b/lib/version.inc.php
index 65278766..3f870d38 100644
--- a/lib/version.inc.php
+++ b/lib/version.inc.php
@@ -19,7 +19,7 @@
$version = '0.9.39.5';
// Database version (YYYYMMDDC where C is a daily counter)
-$dbversion = '201805240';
+$dbversion = '201805241';
// Distribution branding-tag (used for Debian etc.)
$branding = '';
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 2c068780..6a6ffe92 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -337,8 +337,8 @@ $lng['serversettings']['documentroot_prefix']['title'] = 'Home directory';
$lng['serversettings']['documentroot_prefix']['description'] = 'Where should all home directories be stored?';
$lng['serversettings']['logfiles_directory']['title'] = 'Logfiles directory';
$lng['serversettings']['logfiles_directory']['description'] = 'Where should all log files be stored?';
-$lng['serversettings']['logfiles_directory2']['title'] = 'Logfiles directory or custom script';
-$lng['serversettings']['logfiles_directory2']['description'] = 'Where should all log files be stored? Optionally, you can specify a script here and use the placeholders {LOGFILE}, {DOMAIN} and {CUSTOMER} if needed. In case of a custom script you will need to activate the Pipe webserver logfiles option';
+$lng['serversettings']['logfiles_script']['title'] = 'Custom script to pipe log-files to';
+$lng['serversettings']['logfiles_script']['description'] = 'You can specify a script here and use the placeholders {LOGFILE}, {DOMAIN} and {CUSTOMER} if needed. In case you want to use it you will need to activate the Pipe webserver logfiles option too. No prefixed pipe-character is needed.';
$lng['serversettings']['logfiles_format']['title'] = 'Access-log format';
$lng['serversettings']['logfiles_format']['description'] = 'Enter a custom log-format here according to your webservers specifications, leave empty for default';
$lng['serversettings']['logfiles_type']['title'] = 'Access-log type';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 87fd914e..1c2936af 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -333,8 +333,8 @@ $lng['serversettings']['documentroot_prefix']['title'] = 'Heimatverzeichnis';
$lng['serversettings']['documentroot_prefix']['description'] = 'Wo sollen die Heimatverzeichnisse der Kunden liegen?';
$lng['serversettings']['logfiles_directory']['title'] = 'Webserver-Logdateien-Verzeichnis';
$lng['serversettings']['logfiles_directory']['description'] = 'Wo sollen die Logdateien des Webservers liegen?';
-$lng['serversettings']['logfiles_directory2']['title'] = 'Webserver-Logdateien-Verzeichnis oder eigenes Script';
-$lng['serversettings']['logfiles_directory2']['description'] = 'Wo sollen die Logdateien des Webservers liegen? Optional kann hier ein Script hinterlegt und die Platzhalter {LOGFILE}, {DOMAIN} und {CUSTOMER} genutzt werden, sofern nötig. Falls ein Script angegeben wird, muss die Option Webserver Logdateien umleiten gesetzt werden';
+$lng['serversettings']['logfiles_script']['title'] = 'Eigenes Script zu dem Log-Files übergeben werden';
+$lng['serversettings']['logfiles_script']['description'] = 'Hier kann ein Script an das die Loginhalte übergeben werden hinterlegt und die Platzhalter {LOGFILE}, {DOMAIN} und {CUSTOMER} genutzt werden, sofern nötig. Falls ein Script angegeben wird, muss die Option Webserver Logdateien umleiten gesetzt werden';
$lng['serversettings']['logfiles_format']['title'] = 'Access-Log Format';
$lng['serversettings']['logfiles_format']['description'] = 'Hier kann ein angepasstes Log-format entsprechend der Webserver-Dokumentation angegeben werden, leer lassen für Standard';
$lng['serversettings']['logfiles_type']['title'] = 'Access-Log Typ';
diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php
index 9dab54a5..4294ecf5 100644
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -733,19 +733,16 @@ class apache extends HttpConfigBase
$logtype = 'vhost_combined';
}
- if (Settings::Get('system.logfiles_piped') == '1') {
- // don't use custom-script as path for logfile-names
- $error_log = makeCorrectFile($domain['loginname'] . $speciallogfile . '-error.log');
- $access_log = makeCorrectFile($domain['loginname'] . $speciallogfile . '-access.log');
+ if (Settings::Get('system.logfiles_piped') == '1' && Settings::Get('system.logfiles_script') != '') {
// replace for error_log
- $command = replace_variables(Settings::Get('system.logfiles_directory'), array(
+ $command = replace_variables(Settings::Get('system.logfiles_script'), array(
'LOGFILE' => $error_log,
'DOMAIN' => $domain['domain'],
'CUSTOMER' => $domain['loginname']
));
$logfiles_text .= ' ErrorLog "| ' . $command . "\"\n";
// replace for access_log
- $command = replace_variables(Settings::Get('system.logfiles_directory'), array(
+ $command = replace_variables(Settings::Get('system.logfiles_script'), array(
'LOGFILE' => $access_log,
'DOMAIN' => $domain['domain'],
'CUSTOMER' => $domain['loginname']