Skip to content

Correct RedHad alternatives and profile.d handling #31

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correct RedHad alternatives and profile.d handling #31

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
26 changes: 10 additions & 16 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,26 +178,20 @@
case $::osfamily {
RedHat, Linux: {
if ( $default_java ) {
file { '/etc/alternatives/java':
ensure => link,
target => "${java_home}/bin/java",
$javaBinDir = "${java_home}/bin"
exec { 'install-java-alternative':
unless => "alternatives --display java | grep link | grep -o '${javaBinDir}/java'",
command => "alternatives --install /usr/bin/java java ${javaBinDir}/java ${version}${version_u}${version_b} --slave /usr/bin/javac javac ${javaBinDir}/javac --slave /usr/bin/jar jar ${javaBinDir}/jar --slave /usr/bin/javadoc javadoc ${javaBinDir}/javadoc --slave /usr/bin/keytool keytool ${javaBinDir}/keytool --slave /usr/bin/orbd orbd ${javaBinDir}/orbd --slave /usr/bin/pack200 pack200 ${javaBinDir}/pack200 --slave /usr/bin/rmid rmid ${javaBinDir}/rmid --slave /usr/bin/rmiregistry rmiregistry ${javaBinDir}/rmiregistry --slave /usr/bin/servertool servertool ${javaBinDir}/servertool --slave /usr/bin/tnameserv tnameserv ${javaBinDir}/tnameserv --slave /usr/bin/unpack200 unpack200 ${javaBinDir}/unpack200 --slave /usr/bin/rmiregistry rmiregistry ${javaBinDir}/rmiregistry",
require => Exec['extract_jdk'],
} -> exec { 'set-java-alternative':
unless => "alternatives --display java | grep link | grep -o '${javaBinDir}/java'",
command => "alternatives --set java ${javaBinDir}/java",
}
file { '/etc/alternatives/javac':
ensure => link,
target => "${java_home}/bin/javac",
file { '/etc/profile.d/java.sh':
ensure => present,
content => "export JAVA_HOME=${java_home}",
require => Exec['extract_jdk'],
}
file { '/usr/sbin/java':
ensure => link,
target => '/etc/alternatives/java',
require => File['/etc/alternatives/java'],
}
file { '/usr/sbin/javac':
ensure => link,
target => '/etc/alternatives/javac',
require => File['/etc/alternatives/javac'],
}
}
file { "${install_dir}/java_home":
ensure => link,
Expand Down