RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Fix basedir management (correctly avoid duplicate resource declarations)

Browse Source
This commit is contained in:
Tim Eilers
2019-06-25 17:03:07 +02:00
committed by lionce
parent da548082fe
commit 4dbf9321eb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/adopt.pp
View File

@@ -121,7 +121,7 @@ define java::adopt (
$proxy_server = undef, $proxy_server = undef,
$proxy_type = undef, $proxy_type = undef,
$basedir = undef, $basedir = undef,
$manage_basedir = false, $manage_basedir = true,
$package_type = undef, $package_type = undef,
) { ) {
@@ -342,7 +342,12 @@ define java::adopt (
} }
if $manage_basedir { if $manage_basedir {
ensure_resource('file', $_basedir, {'ensure' => 'directory', 'before' => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"]}) if (!defined(File[$_basedir])) {
file { $_basedir:
ensure => 'directory',
before => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"],
}
}
} }
exec { "Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}" : exec { "Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}" :