aboutsummaryrefslogtreecommitdiff
path: root/manifests/virtual.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-17 20:57:21 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-17 20:57:21 -0300
commitc38a65d0c8565ebe3d22a72c396f233929b93287 (patch)
tree90592df1a872e4f2a1c571a25b9552688df16690 /manifests/virtual.pp
parent50a114ab258bd5b9186b61a9c73d82f2ffdab3f6 (diff)
parent969076a813b88dafd222c413bf6fbabab837eafb (diff)
downloadpuppet-postfix-c38a65d0c8565ebe3d22a72c396f233929b93287.tar.gz
puppet-postfix-c38a65d0c8565ebe3d22a72c396f233929b93287.tar.bz2
Merge remote-tracking branch 'shared/master' into upstreamHEADmaster
Conflicts: manifests/init.pp templates/master.cf.debian-7.erb
Diffstat (limited to 'manifests/virtual.pp')
-rw-r--r--manifests/virtual.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/virtual.pp b/manifests/virtual.pp
index d6912a4..06df32a 100644
--- a/manifests/virtual.pp
+++ b/manifests/virtual.pp
@@ -12,7 +12,7 @@ Requires:
- Class["postfix"]
- Postfix::Hash["/etc/postfix/virtual"]
- Postfix::Config["virtual_alias_maps"]
-- common::line (from module common)
+- file_line (from module stdlib)
Example usage:
@@ -34,9 +34,9 @@ Example usage:
*/
define postfix::virtual ($ensure="present", $destination) {
- line {"${name} ${destination}":
+ file_line {"${name} ${destination}":
ensure => $ensure,
- file => "/etc/postfix/virtual",
+ path => "/etc/postfix/virtual",
line => "${name} ${destination}",
notify => Exec["generate /etc/postfix/virtual.db"],
require => Package["postfix"],