Skip to content

Commit 94e8c3b

Browse files
author
Till Brehm
committed
Merge branch 'patch-bind-zonefiles-prefix' into 'develop'
Convert zone_file_prefix and slave_zone_file_prefix functions to config option See merge request ispconfig/ispconfig3!1376
2 parents d5380a3 + 7b4a869 commit 94e8c3b

29 files changed

+217
-27
lines changed

‎install/tpl/server.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ bind_user=root
142142
bind_group=bind
143143
bind_zonefiles_dir=/etc/bind
144144
bind_keyfiles_dir=/etc/bind
145+
bind_zonefiles_masterprefix=pri.
146+
bind_zonefiles_slaveprefix=slave/sec.
145147
named_conf_path=/etc/bind/named.conf
146148
named_conf_local_path=/etc/bind/named.conf.local
147149
disable_bind_log=n

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,6 +1666,30 @@
16661666
'width' => '40',
16671667
'maxlength' => '255'
16681668
),
1669+
'bind_zonefiles_masterprefix' => array(
1670+
'datatype' => 'VARCHAR',
1671+
'formtype' => 'TEXT',
1672+
'default' => '',
1673+
'validators' => array( 0 => array ( 'type' => 'REGEX',
1674+
'regex' => '/^[a-zA-Z0-9\.\-\_\/]{0,128}$/',
1675+
'errmsg'=> 'bind_zonefiles_masterprefix_error_regex'),
1676+
),
1677+
'value' => '',
1678+
'width' => '40',
1679+
'maxlength' => '255'
1680+
),
1681+
'bind_zonefiles_slaveprefix' => array(
1682+
'datatype' => 'VARCHAR',
1683+
'formtype' => 'TEXT',
1684+
'default' => '',
1685+
'validators' => array( 0 => array ( 'type' => 'REGEX',
1686+
'regex' => '/^[a-zA-Z0-9\.\-\_\/]{0,128}$/',
1687+
'errmsg'=> 'bind_zonefiles_slaveprefix_error_regex'),
1688+
),
1689+
'value' => '',
1690+
'width' => '40',
1691+
'maxlength' => '255'
1692+
),
16691693
'named_conf_path' => array(
16701694
'datatype' => 'VARCHAR',
16711695
'formtype' => 'TEXT',

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Usar links físicos é inseguro, mas eco
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Permitir links físicos enjaulados';
343343
$wb['jailkit_hardlinks_no_txt'] = 'Não, remover arquivos de links físicos';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Sim, usar links físicos quando possível';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

‎interface/web/admin/lib/lang/ca_server_config.lng‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'Ne, odstranit soubory s pevným odkazem';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Ano, pokud je to možné, použijte pevné odkazy';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,10 @@ $wb['jailkit_hardlinks_no_txt'] = 'Nein, entferne hardgelinkte Dateien';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Ja, benutze hardlinks wenn möglich';
345345
$wb['mailbox_soft_delete_txt'] = 'Postfach Soft-Löschung';
346346
$wb['mailbox_soft_delete_info_txt'] = 'wird standardmäßig nach 7 Tagen gelöscht.';
347+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
348+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
349+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
350+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
351+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
352+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
353+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';

‎interface/web/admin/lib/lang/dk_server_config.lng‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

‎interface/web/admin/lib/lang/el_server_config.lng‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,5 +342,12 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d
342342
$wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail';
343343
$wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files';
344344
$wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible';
345+
$wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix';
346+
$wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix';
347+
$wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory';
348+
$wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.';
349+
$wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.';
350+
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
351+
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
345352
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
346353
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';

0 commit comments

Comments
 (0)