From: mh <mh@immerda.ch>
Date: Wed, 9 Jul 2014 21:14:42 +0000 (+0200)
Subject: get rid off lsb facts
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f9068edca5cd1dfd4348a9285df447a293d287fd;p=puppet-postfix.git

get rid off lsb facts
---

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