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 /manifests/definitions/bind-mx.pp | |
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 'manifests/definitions/bind-mx.pp')
-rw-r--r-- | manifests/definitions/bind-mx.pp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/manifests/definitions/bind-mx.pp b/manifests/definitions/bind-mx.pp deleted file mode 100644 index 10f34b8..0000000 --- a/manifests/definitions/bind-mx.pp +++ /dev/null @@ -1,34 +0,0 @@ -/* - -= Definition: bind::mx -Creates an MX record. - -Arguments: - *$zone*: Bind::Zone name - *$owner*: owner of the Resource Record - *$priority*: MX record priority - *$host*: target of the Resource Record - *$ttl*: Time to Live for the Resource Record. Optional. - -*/ -define bind::mx($ensure=present, - $zone, - $owner=false, - $priority, - $host, - $ttl=false) { - - if $owner { - $_owner = $owner - } else { - $_owner = $name - } - - common::concatfilepart{"bind.${name}": - file => "/etc/bind/pri/${zone}.conf", - ensure => $ensure, - notify => Service["bind9"], - content => template("bind/mx-record.erb"), - } -} - |