Merge remote-tracking branch 'ocado/notify-source' into 6.0-prerelease

2016-04-20 08:02:26 -05:00
parent 8348f42a17 0f5d3e6019
commit d50406d0df
4 changed files with 20 additions and 1 deletions
@@ -42,7 +42,16 @@ view "<%= @name %>" {
 		keys { <%= properties['keys'] %>; };
 <%-     end -%>
 	};
-<%-   end -%>
+<%- end -%>
+<%- if @also_notify and @also_notify != '' -%>
+	also-notify {
+<%-     Array(@also_notify).each do |server| -%>
+		<%= server %>;
+<%-     end -%>
+	};
+<%- end -%>
+<%- if @notify_source and @notify_source != '' -%>
+	notify-source <%= @notify_source %>;
 <%- end -%>
 <%- if @include_default_zones and @default_zones_include -%>
 	include "<%= @default_zones_include %>";
@@ -40,6 +40,9 @@ zone "<%= @_domain %>" {
 <%- if @transfer_source and @transfer_source != ''-%>
 	transfer-source <%= @transfer_source %>;
 <%- end -%>
+<%- if @notify_source and @notify_source != ''-%>
+	notify-source <%= @notify_source %>;
+<%- end -%>
 <%- if @allow_updates and @allow_updates != '' -%>
 	allow-update {
 <%-   Array(@allow_updates).each do |allow_update| -%>