get rid off lsb facts

diff --git a/manifests/init.pp b/manifests/init.pp
index c7b9ce80f0c58cbb3c8cf8cb9cf526948757a6ec..3d51bb151055b382344a7dd2ef7203482a29dd09 100644 (file)
--- 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