Skip to content

Commit 3ba59d5

Browse files
author
Marius Cramer
committed
Merge branch 'master' into 'master'
add missing wb-entry See merge request !204
2 parents dc679e3 + 3fa4439 commit 3ba59d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+61
-3
lines changed

install/tpl/server.ini.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ bind_group=bind
115115
bind_zonefiles_dir=/etc/bind
116116
named_conf_path=/etc/bind/named.conf
117117
named_conf_local_path=/etc/bind/named.conf.local
118+
disable_bind_log=n
118119

119120
[fastcgi]
120121
fastcgi_starter_path=/var/www/php-fcgi-scripts/[system_user]/

interface/web/admin/form/server_config.tform.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,12 @@
12041204
'width' => '40',
12051205
'maxlength' => '255'
12061206
),
1207+
'disable_bind_log' => array (
1208+
'datatype' => 'VARCHAR',
1209+
'formtype' => 'CHECKBOX',
1210+
'default' => 'n',
1211+
'value' => array(0 => 'n', 1 => 'y')
1212+
),
12071213
//#################################
12081214
// ENDE Datatable fields
12091215
//#################################

interface/web/admin/lib/lang/ar_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
254254
$wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
255255
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
256256
$wb['network_filesystem_txt'] = 'Network Filesystem';
257+
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
257258
?>

interface/web/admin/lib/lang/ar_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ $wb['No'] = 'No';
7272
$wb['min_password_length_txt'] = 'Minimum password length';
7373
$wb['min_password_strength_txt'] = 'Minimum password strength';
7474
$wb["company_name_txt"] = "Company Name for the page title";
75+
$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
7576
?>

interface/web/admin/lib/lang/bg_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
254254
$wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
255255
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
256256
$wb['network_filesystem_txt'] = 'Network Filesystem';
257+
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
257258
?>

interface/web/admin/lib/lang/bg_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ $wb['No'] = 'No';
7272
$wb['min_password_length_txt'] = 'Minimum password length';
7373
$wb['min_password_strength_txt'] = 'Minimum password strength';
7474
$wb["company_name_txt"] = "Company Name for the page title";
75+
$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
7576
?>

interface/web/admin/lib/lang/br_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
254254
$wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
255255
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
256256
$wb['network_filesystem_txt'] = 'Network Filesystem';
257+
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
257258
?>

interface/web/admin/lib/lang/br_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ $wb['No'] = 'No';
7272
$wb['min_password_length_txt'] = 'Minimum password length';
7373
$wb['min_password_strength_txt'] = 'Minimum password strength';
7474
$wb["company_name_txt"] = "Company Name for the page title";
75+
$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
7576
?>

interface/web/admin/lib/lang/cz_server_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,5 +252,6 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
252252
$wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
253253
$wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
254254
$wb['network_filesystem_txt'] = 'Network Filesystem';
255+
$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
255256
?>
256257

interface/web/admin/lib/lang/cz_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ $wb['No'] = 'Ne';
7272
$wb['min_password_length_txt'] = 'Minimální délka hesla';
7373
$wb['min_password_strength_txt'] = 'Minimální síla hesla';
7474
$wb["company_name_txt"] = "Company Name for the page title";
75+
$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
7576
?>
7677

0 commit comments

Comments
 (0)