From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/conf/bind_pri.domain.master |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/server/conf/bind_pri.domain.master b/server/conf/bind_pri.domain.master
index 279fbac..ed39506 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'}
@@ -41,6 +47,9 @@
 <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>
+<tmpl_if name="type" op='==' value='TLSA'>
+{tmpl_var name='name'} {tmpl_var name='ttl'}      TLSA       {tmpl_var name='data'}
+</tmpl_if>
 <tmpl_if name="type" op='==' value='TXT'>
 {tmpl_var name='name'} {tmpl_var name='ttl'}      TXT        "{tmpl_var name='data'}"
 </tmpl_if>

--
Gitblit v1.9.1