diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 21:24:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 21:24:54 -0200 |
| commit | 3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01 (patch) | |
| tree | df97fe71507fd9eeed3deb08b87f41a503e75bbe /templates | |
| parent | 999e4e426996f3169b0a8f647eee8e8ab4ec8c33 (diff) | |
| parent | 88a39666e5b0ddf668baf93c111b549628f79704 (diff) | |
| download | puppet-bind-3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01.tar.gz puppet-bind-3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01.tar.bz2 | |
Merge branch 'master' of https://github.com/camptocamp/puppet-bind
Conflicts:
manifests/definitions/bind-mx.pp
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/generate.erb | 1 | ||||
| -rw-r--r-- | templates/zone-header.erb | 3 | ||||
| -rw-r--r-- | templates/zone-slave.erb | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/templates/generate.erb b/templates/generate.erb new file mode 100644 index 0000000..0c15823 --- /dev/null +++ b/templates/generate.erb @@ -0,0 +1 @@ +$GENERATE <%=range%> <%=lhs%> <%=ttl%> <%=record_class%> <%=record_type%> <%=rhs%> ; <%=name%> diff --git a/templates/zone-header.erb b/templates/zone-header.erb index da93b31..418aef8 100644 --- a/templates/zone-header.erb +++ b/templates/zone-header.erb @@ -1,5 +1,8 @@ ; File managed by puppet $TTL <%=zone_ttl%> +<% if zone_origin -%> +$ORIGIN <%=zone_origin%> +<% end -%> @ IN SOA <%=name%>. <%=zone_contact%>. ( <%=zone_serial%> ; serial <%=zone_refresh%> ; refresh diff --git a/templates/zone-slave.erb b/templates/zone-slave.erb index b5b3754..0ae7e5d 100644 --- a/templates/zone-slave.erb +++ b/templates/zone-slave.erb @@ -7,5 +7,4 @@ zone <%=name%> IN { masters { <%= zone_masters %>; }; <% end -%> allow-query { any; }; - notify yes; -} +}; |