Skip to content

Commit 8f91db9

Browse files
author
Marius Burkard
committed
Merge branch 'patch-dns-zone-rendering' into 'develop'
Show rendered bind dns zone in extra tab See merge request ispconfig/ispconfig3!1379
2 parents 90cd1a2 + 0cdd669 commit 8f91db9

Some content is hidden

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

58 files changed

+126
-3
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ public function grant_master_database_rights($verbose = false) {
788788
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
789789
}
790790

791-
$query = "GRANT SELECT, UPDATE(`dnssec_initialized`, `dnssec_info`, `dnssec_last_signed`) ON ?? TO ?@?";
791+
$query = "GRANT SELECT, UPDATE(`dnssec_initialized`, `dnssec_info`, `dnssec_last_signed`, `rendered_zone`) ON ?? TO ?@?";
792792
if ($verbose){
793793
echo $query ."\n";
794794
}

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ CREATE TABLE IF NOT EXISTS `mail_relay_domain` (
1616

1717
INSERT INTO `mail_relay_domain` SELECT NULL, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `domain`, 'OK', `active` FROM `mail_transport` WHERE `domain` NOT LIKE '%@%' AND `domain` LIKE '%.%' GROUP BY `domain`, `server_id`;
1818

19+
ALTER TABLE `dns_soa` ADD `rendered_zone` MEDIUMTEXT NULL AFTER `dnssec_info`;

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ CREATE TABLE `dns_soa` (
635635
`dnssec_algo` SET('NSEC3RSASHA1','ECDSAP256SHA256') NOT NULL DEFAULT 'ECDSAP256SHA256',
636636
`dnssec_last_signed` BIGINT NOT NULL DEFAULT '0',
637637
`dnssec_info` TEXT NULL,
638+
`rendered_zone` MEDIUMTEXT NULL,
638639
PRIMARY KEY (`id`),
639640
UNIQUE KEY `origin` (`origin`),
640641
KEY `active` (`active`)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,12 @@
481481
'value' => '',
482482
'name' => 'default_slave_dnsserver'
483483
),
484+
'dns_show_zoneexport' => array (
485+
'datatype' => 'VARCHAR',
486+
'formtype' => 'CHECKBOX',
487+
'default' => 'n',
488+
'value' => array(0 => 'n', 1 => 'y')
489+
),
484490
//#################################
485491
// END Datatable fields
486492
//#################################

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ $wb['show_support_messages_txt'] = 'Show message function in help module';
105105
$wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108+
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
108109
?>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ $wb['show_support_messages_txt'] = 'Show message function in help module';
105105
$wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108+
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
108109
?>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,4 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['monitor_key_txt'] = 'Senha do Monitor';
109+
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ $wb['show_support_messages_txt'] = 'Show message function in help module';
105105
$wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108+
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
108109
?>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,4 @@ $wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108108
$wb['monitor_key_txt'] = 'Monitor keyword';
109+
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,5 @@ $wb['show_support_messages_txt'] = 'Show message function in help module';
105105
$wb['show_aps_menu_txt'] = 'Show APS menu';
106106
$wb['show_aps_menu_note_txt'] = 'APS will be removed from the panel in the near future.';
107107
$wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
108+
$wb['dns_show_zoneexport_txt'] = 'Show zone export.';
108109
?>

0 commit comments

Comments
 (0)