From 1231da8128540a0cb503b219a6dbe0300e24b8b4 Mon Sep 17 00:00:00 2001 From: A. Täffner <darkalex@firesplash.de> Date: Sat, 23 Jan 2016 17:13:18 -0500 Subject: [PATCH] beginning implementing some new types partly on request --- install/sql/ispconfig3.sql | 2 +- install/sql/incremental/upd_dev_collection.sql | 2 +- server/conf/bind_pri.domain.master | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index 07fb007..030209e 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -206,7 +206,7 @@ --- DNSSEC-Implementation by dark alex --- TODO: Review and resolve conflicts if more has been done in that column -ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`; +ALTER TABLE `dns_rr` CHANGE COLUMN `type` `type` ENUM('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SPF','SRV','TXT','TLSA','DNSKEY') NULL DEFAULT NULL AFTER `name`; ALTER TABLE `dns_soa` ADD COLUMN `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N', diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 6a4a946..50ef393 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -478,7 +478,7 @@ `server_id` int(11) NOT NULL default '1', `zone` int(11) unsigned NOT NULL DEFAULT '0', `name` varchar(255) NOT NULL DEFAULT '', - `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') default NULL, + `type` enum('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SPF','SRV','TXT','TLSA','DNSKEY') default NULL, `data` TEXT NOT NULL DEFAULT '', `aux` int(11) unsigned NOT NULL default '0', `ttl` int(11) unsigned NOT NULL default '3600', diff --git a/server/conf/bind_pri.domain.master b/server/conf/bind_pri.domain.master index 0e9c6cd..a0d1395 100644 --- a/server/conf/bind_pri.domain.master +++ b/server/conf/bind_pri.domain.master @@ -23,8 +23,14 @@ <tmpl_if name="type" op='==' value='CNAME'> {tmpl_var name='name'} {tmpl_var name='ttl'} CNAME {tmpl_var name='data'} </tmpl_if> +<tmpl_if name="type" op='==' value='DS'> +{tmpl_var name='name'} {tmpl_var name='ttl'} DS {tmpl_var name='data'} +</tmpl_if> <tmpl_if name="type" op='==' value='HINFO'> {tmpl_var name='name'} {tmpl_var name='ttl'} HINFO {tmpl_var name='data'} +</tmpl_if> +<tmpl_if name="type" op='==' value='LOC'> +{tmpl_var name='name'} {tmpl_var name='ttl'} LOC {tmpl_var name='data'} </tmpl_if> <tmpl_if name="type" op='==' value='MX'> {tmpl_var name='name'} {tmpl_var name='ttl'} MX {tmpl_var name='aux'} {tmpl_var name='data'} @@ -38,6 +44,9 @@ <tmpl_if name="type" op='==' value='RP'> {tmpl_var name='name'} {tmpl_var name='ttl'} RP {tmpl_var name='data'} </tmpl_if> +<tmpl_if name="type" op='==' value='SPF'> +{tmpl_var name='name'} {tmpl_var name='ttl'} SPF {tmpl_var name='data'} +</tmpl_if> <tmpl_if name="type" op='==' value='SRV'> {tmpl_var name='name'} {tmpl_var name='ttl'} SRV {tmpl_var name='aux'} {tmpl_var name='data'} </tmpl_if> -- Gitblit v1.9.1