diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-12 19:42:12 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-12 19:43:42 -0700 |
| commit | b4bb79e89c94b8d85510239ff6749a6149facbc3 (patch) | |
| tree | 7140fab5aa4229eb8fd7921af719d5b76acf7d03 | |
| parent | d713ad19dd8e80e49c39ec36362ebbc440f8bcf3 (diff) | |
| download | puppet-b4bb79e89c94b8d85510239ff6749a6149facbc3.tar puppet-b4bb79e89c94b8d85510239ff6749a6149facbc3.tar.gz puppet-b4bb79e89c94b8d85510239ff6749a6149facbc3.tar.bz2 puppet-b4bb79e89c94b8d85510239ff6749a6149facbc3.tar.xz puppet-b4bb79e89c94b8d85510239ff6749a6149facbc3.zip | |
Remove duplicate wget, fix nail for newer releases
Puppet doesn't like it when two modules want the same package, so rely
on wget being part of the base package set. nail is called s-nail on
>= mga9 so fix binrepo.
| -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, |