diff options
| -rw-r--r-- | modules/blog/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/binrepo.pp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index fb0ea146..c89a8168 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -19,13 +19,11 @@ if versioncmp($::lsbdistrelease, '9') < 0 { package { ['php-mysqlnd', 'php-ldap', 'unzip', - 'wget', 'nail']: } } else { package { ['php-mysqlnd', 'php-ldap', 'unzip', - 'wget', 's-nail']: } } diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp index f2f529c0..5bf16b53 100644 --- a/modules/buildsystem/manifests/binrepo.pp +++ b/modules/buildsystem/manifests/binrepo.pp @@ -3,10 +3,16 @@ class buildsystem::binrepo { include buildsystem::var::groups include sudo - # upload-bin script use the mailx command provided by nail + # upload-bin script uses the mailx command provided by nail +if versioncmp($::lsbdistrelease, '9') < 0 { package { 'nail': ensure => installed, } +} else { + package { 's-nail': + ensure => installed, + } +} user { $buildsystem::var::binrepo::login: home => $buildsystem::var::binrepo::homedir, |