From f9068edca5cd1dfd4348a9285df447a293d287fd Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 9 Jul 2014 23:14:42 +0200 Subject: [PATCH] get rid off lsb facts --- manifests/init.pp | 4 ++-- .../{master.cf.debian-lenny.erb => master.cf.debian-6.erb} | 0 .../{master.cf.debian-wheezy.erb => master.cf.debian-7.erb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename templates/{master.cf.debian-lenny.erb => master.cf.debian-6.erb} (100%) rename templates/{master.cf.debian-wheezy.erb => master.cf.debian-7.erb} (100%) 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 similarity index 100% rename from templates/master.cf.debian-lenny.erb rename to templates/master.cf.debian-6.erb diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-7.erb similarity index 100% rename from templates/master.cf.debian-wheezy.erb rename to templates/master.cf.debian-7.erb