Skip to content

Commit

Permalink
Merge pull request #18 from sschneid/master
Browse files Browse the repository at this point in the history
Add Solaris support
  • Loading branch information
adrienthebo committed Nov 15, 2012
2 parents 4ab58a2 + e37f6d5 commit 017a749
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2012-11-15 Scott Schneider <sschneider@puppetlabs.com> - 0.2.0
* Add Solaris support

2011-06-16 Jeff McCune <jeff@puppetlabs.com> - 0.1.5
* Add Debian based distro (Lucid) support

Expand Down
2 changes: 1 addition & 1 deletion Modulefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'puppetlabs-java'
version '0.1.5'
version '0.2.0'
source 'git://github.com/puppetlabs/puppetlabs-java'
author 'puppetlabs'
license 'Apache'
Expand Down
16 changes: 16 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@

}

'Solaris': {

$distribution_solaris = $distribution ? {
jdk => 'developer/java/jdk-7',
jre => 'runtime/java/jre-7',
}

class { 'java::package_solaris':
version => $version,
distribution => $distribution_solaris,
require => Anchor['java::begin'],
before => Anchor['java::end'],
}

}

default: {
fail("osfamily ${::osfamily} is not supported")
}
Expand Down
27 changes: 27 additions & 0 deletions manifests/package_solaris.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Class: java::package_solaris
#
# Implementation class of the Java package
# for Solaris based systems.
#
# This class is not meant to be used by the end user
# of the module. It is an implementation class
# of the composite Class[java]
#
# Parameters:
#
# Actions:
#
# Requires:
#
# Sample Usage:
#
class java::package_solaris(
$version,
$distribution
) {

package { 'java':
ensure => $version,
name => $distribution,
}
}

0 comments on commit 017a749

Please sign in to comment.