Skip to content

fix(compatibility): Conflict with other modules #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2015
Merged

fix(compatibility): Conflict with other modules #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 7 additions & 39 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,24 @@
fail('This module is supported only on Linux.')
}

if ! defined(Package['curl']) {
package { 'curl':
ensure => present
}
}

if ! defined(Package['bzip2']) {
package { 'bzip2':
ensure => present
}
}
ensure_packages('curl')
ensure_packages('bzip2')

# Ensure packages based on operating system exist
case $::operatingsystem {
/(?:CentOS|RedHat|Amazon|Scientific)/: {
# Requirements for CentOS/RHEL according to phantomjs.org
if ! defined(Package['fontconfig']) {
package { 'fontconfig':
ensure => present
}
}

if ! defined(Package['freetype']) {
package { 'freetype':
ensure => present
}
}
ensure_packages('fontconfig')
ensure_packages('freetype')

if $::operatingsystem == 'Amazon' {
$libstdc_package = 'compat-libstdc++-33'
} else {
$libstdc_package = 'libstdc++'
}

if ! defined(Package[$libstdc_package]) {
package { $libstdc_package:
ensure => present
}
}

if ! defined(Package['urw-fonts']) {
package { 'urw-fonts':
ensure => present
}
}
ensure_packages($libstdc_package)
ensure_packages('urw-fonts')

$packages = [
Package['curl'],
Expand All @@ -69,12 +42,7 @@
]
}
default: {
if ! defined(Package['libfontconfig1']) {
package { 'libfontconfig1':
ensure => present
}
}

ensure_packages('libfontconfig1')
$packages = [
Package['curl'],
Package['bzip2'],
Expand Down