Commit dd7511cd authored by Marc Fournier's avatar Marc Fournier
Browse files

Merge pull request #19 from mfournier/mailx-pkg-name 

postfix: improved mailx package name definition logic.
parents 5afe18c2 9cfd6845

manifests/init.pp

+18 −3
Changes for manifests/init.pp: 18 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -57,10 +57,25 @@ class postfix { 
    $postfix_mail_user = 'vmail'

  }



  case $::operatingsystem {

    /RedHat|CentOS|Fedora/: {

      $mailx_package = 'mailx'

    }



    /Debian|kFreeBSD/: {

      $mailx_package = $::lsbdistcodename ? {

    'squeeze' => 'bsd-mailx',

    'lucid'   => 'bsd-mailx',

    default   => 'mailx',

        /lenny|etch|sarge/ => 'mailx',

        default            => 'bsd-mailx',

      }

    }



    'Ubuntu': {

      if (versioncmp('10', $::lsbmajdistrelease) > 0) {

        $mailx_package = 'mailx'

      } else {

        $mailx_package = 'bsd-mailx'

      }

    }

  }



  $master_os_template = $::operatingsystem ? {