aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-07-09 23:14:42 +0200
committermh <mh@immerda.ch>2014-07-09 23:14:42 +0200
commitf9068edca5cd1dfd4348a9285df447a293d287fd (patch)
tree93abf9c6d8be659ef877360caa1c3249746c5073
parent39f1218960348d43bd368bff546d9467a1264e0d (diff)
downloadpuppet-postfix-f9068edca5cd1dfd4348a9285df447a293d287fd.tar.gz
puppet-postfix-f9068edca5cd1dfd4348a9285df447a293d287fd.tar.bz2
get rid off lsb facts
-rw-r--r--manifests/init.pp4
-rw-r--r--templates/master.cf.debian-6.erb (renamed from templates/master.cf.debian-lenny.erb)0
-rw-r--r--templates/master.cf.debian-7.erb (renamed from templates/master.cf.debian-wheezy.erb)0
3 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index c7b9ce8..3d51bb1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -59,7 +59,7 @@ class postfix(
case $::operatingsystem {
RedHat, CentOS: {
- case $::lsbmajdistrelease {
+ case $::operatingsystemmajrelease {
"4": { $postfix_seltype = "etc_t" }
"5": { $postfix_seltype = "postfix_etc_t" }
default: { $postfix_seltype = undef }
@@ -143,7 +143,7 @@ class postfix(
content => $::operatingsystem ? {
Redhat => template("postfix/master.cf.redhat5.erb"),
CentOS => template("postfix/master.cf.redhat5.erb"),
- Debian => template("postfix/master.cf.debian-${::lsbdistcodename}.erb"),
+ Debian => template("postfix/master.cf.debian-${::operatingsystemmajrelease}.erb"),
Ubuntu => template("postfix/master.cf.debian-etch.erb"),
},
seltype => $postfix_seltype,
diff --git a/templates/master.cf.debian-lenny.erb b/templates/master.cf.debian-6.erb
index 50241b8..50241b8 100644
--- a/templates/master.cf.debian-lenny.erb
+++ b/templates/master.cf.debian-6.erb
diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-7.erb
index cc4bbf0..cc4bbf0 100644
--- a/templates/master.cf.debian-wheezy.erb
+++ b/templates/master.cf.debian-7.erb