diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index ec7fac8af3ba30537ff341be74b9e99a2e2972e6..f521cabb39b86463c0b1b712037e7bf94b48df9e 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -115,6 +115,7 @@ bind_group=bind bind_zonefiles_dir=/etc/bind named_conf_path=/etc/bind/named.conf named_conf_local_path=/etc/bind/named.conf.local +disable_bind_log=n [fastcgi] fastcgi_starter_path=/var/www/php-fcgi-scripts/[system_user]/ diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index a03636af4dbb045619effc8b0112ca9808b43b56..6b00e183c35c62e53bedd4ecd8728558b22cd4fe 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -1204,6 +1204,12 @@ $form["tabs"]['dns'] = array( 'width' => '40', 'maxlength' => '255' ), + 'disable_bind_log' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n', 1 => 'y') + ), //################################# // ENDE Datatable fields //################################# diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index b03eaebfddf06d8348f899b30c7bd4ed7163f18b..e2f2db4e2016205a58032a78fd638335106c0cd8 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 10fbc0b3dd0cc4498e55ac0be52cb07b7b3d0249..4365d91108515549294a77e83722e344ff7390af 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 8946db17631e0cad672e6b6692040a4a10fe572f..e34e4ff088eec7124c6605ee02d05825139fddd1 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index c5a3dbc4f3a1aa0cac361b75cdd8721791f8e489..8df2dbe23829dc004e0f7918221fd67930171afa 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -252,5 +252,6 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 336cea82d9921c4617ef2366a471523978f81852..aa448d86b7f4c79003a45a8479d8ebcd23903f99 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -265,4 +265,5 @@ $wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie o $wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung'; $wb['php_handler_txt'] = 'Standard-PHP-Handler'; $wb['enable_spdy_txt'] = 'Stellt SPDY zur Verfügung'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index ca7cf2b26ed6c7de16bf58391712f47d5ca3c9a9..2cef4ed7356870558170a3570c826cb2c7bdff85 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -249,4 +249,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 2628abf292c72ddaa0bd18e3ab20f859e64098b2..b5e4237ea2612e2005eb01ccc52be4617d5a48b9 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -280,4 +280,5 @@ $wb['xmpp_port_http_txt'] = 'HTTP'; $wb['xmpp_port_https_txt'] = 'HTTPS'; $wb['xmpp_port_pastebin_txt'] = 'Pastebin'; $wb['xmpp_port_bosh_txt'] = 'BOSH'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 1c91d0dd6d68028433b77db8b2a79da72f5d0944..a62b3f619833f20d4e9733cafa5b83b852f5800b 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -252,4 +252,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 8ece953fe87473ca6a122c41146fd9fe86873593..f4f88564cc2bf58f94bf9aefc7b655606f30e142 100755 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index d566538a5c46b7facb9e49137b2c4ba73853f37e..0ceb4af89c1c9e338a12fd9449a43848a4b3d098 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -251,5 +251,6 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 4a73d3f63a262f388b7dc8ae7d0775d2c6dee57c..eaf7fb6c824178f9d9a20a273950adfe17f01275 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -255,6 +255,7 @@ $wb['cron_init_script_error_regex'] = 'Neispravan cron init script.'; $wb['crontab_dir_error_regex'] = 'Neispravan crontab direktorij.'; $wb['cron_wget_error_regex'] = 'Neispravna cron wget putanja.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index b29b74413dd9cb48f2c375780d718eea0b2f35f0..58b95245c03ca92007f60e77d7ee9ef70b586a11 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 930a58cbf77b74dcaf18f6f37be2580051d28783..5f89667c409e8dd6ecce8987ea76a97172cb49c3 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index cba103ff83efa4c759d66dce0e7226c1aa68b650..c3d435b1e4ac7ef539c7e3c26fa53129b2eacfcc 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 37fb09ac5d5b968106fa30915905c3ed16ea65ee..3f3c63940af55dd7c6d4d80dfaed991d34ff8d12 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 44eea44022391b7ef440f55b376359cbb0631b9f..e9c32b525d1e3785a7818dfc066fce1ce854d63b 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 5e17c41c53150e74d9c4df497319fd4ef7256b3c..9c55a4f76704beb56c227a0af96c72090d09e09c 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index adf708552fa2a1f5aa107cdaed7132dfef614bbc..712d15aeff30ad9cd0559312d9424fa3fd1af1d2 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index a7ab9bc889b35efd1fa32d5b17f463cc93d385c4..d6d950ffea075eced9936ec3eb7a625f1504bdf7 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 6a4080a12bc59849f8686bd73ccc51f127804d6b..1acfb0541d96d04eab56e7a0438233d814e4e4c7 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 5818cfacb3832063a9f507675ba0e0948c8a05aa..baf79af675e64f94a2b175c6138adc043c60e09e 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 392664b7e20407706703348d019ab7b0ac1dcc0d..1e8ae4dac118821971a38382656ae99eb4618548 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index 60a24ee48b2c987512470c342a821be050ba9059..2e7a7df1b14bf0e7bad914573741b1edd52f73de 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -254,4 +254,5 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.'; $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.'; $wb['cron_wget_error_regex'] = 'Invalid cron wget path.'; $wb['network_filesystem_txt'] = 'Network Filesystem'; +$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN"; ?> diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm index 19f020a0cdedcb91b02969412b21c1fa233ca950..b2b79665748f8f0d7815a33333123fb7dc8ab499 100644 --- a/interface/web/admin/templates/server_config_dns_edit.htm +++ b/interface/web/admin/templates/server_config_dns_edit.htm @@ -20,11 +20,13 @@
- +
+ +
{tmpl_var name='disable_bind_log'}
-
\ No newline at end of file + diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index bb65eef45b141636decd1df4211dfa9b3db58eaa..c538cb9570ce2d07ca395a3d808626ed56a129aa 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -133,7 +133,11 @@ class bind_plugin { if($return_status === 0) { $app->log("Writing BIND domain file: ".$filename, LOGLEVEL_DEBUG); } else { - $app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), LOGLEVEL_WARN); + if($dns_config['disable_bind_log'] === 'y') { + $app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), LOGLEVEL_DEBUG); + } else { + $app->log("Writing BIND domain file failed: ".$filename." ".implode(' ', $out), LOGLEVEL_WARN); + } rename($filename, $filename.'.err'); } unset($tpl);