diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 3c25b1f11aedda0b05380468912f86d76389639d..19ed0a01fe38ded34a02770d5d89d0e5dd541ba4 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -210,5 +210,6 @@ ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME' ALTER TABLE `dns_soa` ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N', + ADD COLUMN `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N', ADD COLUMN `dnssec_info` TEXT NULL; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 9cf34992a92fbf6ea25b43cbafb4dd036c1740a8..bd3ae507460dff5154bcc3f1943f255e1fad4921 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -540,6 +540,7 @@ CREATE TABLE `dns_soa` ( `also_notify` varchar(255) default NULL, `update_acl` varchar(255) default NULL, `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N', + `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N', `dnssec_info` TEXT NULL, PRIMARY KEY (`id`), UNIQUE KEY `origin` (`origin`), diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php index 867bbbcbbeeb37639de4a099c399331b11925067..05e915740c9dd69467680148c307109ccaad5c08 100644 --- a/interface/web/dns/form/dns_soa.tform.php +++ b/interface/web/dns/form/dns_soa.tform.php @@ -264,6 +264,12 @@ $form["tabs"]['dns_soa'] = array ( 'default' => 'Y', 'value' => array(0 => 'N', 1 => 'Y') ), + 'dnssec_wanted' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'Y', + 'value' => array(0 => 'N', 1 => 'Y') + ), 'dnssec_info' => array ( 'datatype' => 'TEXT', 'formtype' => 'TEXTAREA', diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng index 5f675d88c81b8488a72671336810eb5ddd5b6ba9..3cb6ebf248a790dcbcff29d356f1c4188238f4fc 100644 --- a/interface/web/dns/lib/lang/de_dns_soa.lng +++ b/interface/web/dns/lib/lang/de_dns_soa.lng @@ -12,6 +12,7 @@ $wb['ttl_txt'] = 'TTL'; $wb['xfer_txt'] = 'Zonentransfer zu diesen IP Adressen erlauben (mit Komma getrennte Liste)'; $wb['active_txt'] = 'Aktiv'; $wb['dnssec_info_txt'] = 'DNSSEC DS-Daten für Registry'; +$wb['dnssec_wanted_txt'] = 'Zone signieren (DNSSEC)'; $wb['limit_dns_zone_txt'] = 'Die maximale Anzahl an DNS Einträgen für Ihr Konto wurde erreicht.'; $wb['client_txt'] = 'Kunde'; $wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.'; diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng index 9566ce71d8ca471047b37d7ecc52172df49e2823..12f81dd225c2f6441cf0aee8a2ad4c555605230b 100644 --- a/interface/web/dns/lib/lang/en_dns_soa.lng +++ b/interface/web/dns/lib/lang/en_dns_soa.lng @@ -12,6 +12,7 @@ $wb["ttl_txt"] = 'TTL'; $wb["xfer_txt"] = 'Allow zone transfers to <br />these IPs (comma separated list)'; $wb["active_txt"] = 'Active'; $wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry'; +$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)'; $wb["limit_dns_zone_txt"] = 'The max. number of DNS zones for your account is reached.'; $wb["client_txt"] = 'Client'; $wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.'; diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm index 3e4e8e517877b3c7ae16e2caba11defb485757c6..91833bccef053bec79b39d214bf8e1a32bbfd74e 100644 --- a/interface/web/dns/templates/dns_soa_edit.htm +++ b/interface/web/dns/templates/dns_soa_edit.htm @@ -125,6 +125,12 @@ </div> </div> + <div class="form-group"> + <label class="col-sm-3 control-label">{tmpl_var name='dnssec_wanted_txt'}</label> + <div class="col-sm-9"> + {tmpl_var name='dnssec_wanted'} + </div> + </div> <div class="form-group"> <label for="update_acl" class="col-sm-3 control-label">{tmpl_var name='dnssec_info_txt'}</label> <div class="col-sm-9"><textarea readonly="true" rows="5" class="form-control">{tmpl_var name='dnssec_info'}</textarea></div>