From 63e25879c1e21a4f79f04443f2947e58b09b6c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Wed, 22 May 2013 12:18:29 +0200
Subject: [PATCH] Get rid of scope.lookupvar
---
spec/classes/postfix_spec.rb | 2 ++
templates/master.cf.debian.erb | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/spec/classes/postfix_spec.rb b/spec/classes/postfix_spec.rb
index 2d98aac..a52756f 100644
--- a/spec/classes/postfix_spec.rb
+++ b/spec/classes/postfix_spec.rb
@@ -106,6 +106,8 @@ describe 'postfix' do
/schleuder/
).with_content(
/sympa/
+ ).with_content(
+ /user=bar/
)
}
it { should contain_file('/etc/postfix/main.cf').without('seltype') }
diff --git a/templates/master.cf.debian.erb b/templates/master.cf.debian.erb
index b0d8261..aadcc28 100644
--- a/templates/master.cf.debian.erb
+++ b/templates/master.cf.debian.erb
@@ -68,7 +68,7 @@ scache unix - - - - 1 scache
# Also specify in main.cf: maildrop_destination_recipient_limit=1
#
maildrop unix - n n - - pipe
- flags=DRhu user=<%= scope.lookupvar('postfix::mail_user') %> argv=/usr/bin/maildrop -d ${recipient}
+ flags=DRhu user=<%= @mail_user %> argv=/usr/bin/maildrop -d ${recipient}
#
# See the Postfix UUCP_README file for configuration details.
#
--
GitLab