Merge branch 'master' of https://github.com/camptocamp/puppet-bind

Conflicts:
	manifests/definitions/bind-mx.pp

1 files changed, 0 insertions, 35 deletions

diff --git a/manifests/definitions/bind-record.pp b/manifests/definitions/bind-record.pp
deleted file mode 100644
index d551d60..0000000
--- a/manifests/definitions/bind-record.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-= Definition: bind::record
-Helper to create any record you want (but NOT MX, please refer to Bind::Mx)
-
-Arguments:
- *$zone*:        Bind::Zone name
- *$owner*:       owner of the Resource Record
- *$host*:        target of the Resource Record
- *$record_type°:  resource record type
- *$record_class*: resource record class. Default "IN".
- *$ttl*:          Time to Live for the Resource Record. Optional.
-
-*/
-define bind::record($ensure=present,
-    $zone,
-    $owner=false,
-    $host,
-    $record_type,
-    $record_class='IN',
-    $ttl=false) {
-
-  if $owner {
-    $_owner = $owner
-  } else {
-    $_owner = $name
-  }
-
-  common::concatfilepart {"${zone}.${record_type}.${name}":
-    ensure  => $ensure,
-    file    => "/etc/bind/pri/${zone}.conf",
-    content => template("bind/default-record.erb"),
-    notify  => Service["bind9"],
-  }
-}