mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 14:35:27 +00:00
puppet: Manage extracted resources again.
1e4e6a09af removed the resources for the unpacked directory, on the
argument that they were unnecessary. However, the directory (or file,
see below) that is unpacked must be managed, or it will be tidied on
the next puppet apply.
Add back the resource for `$dir`, but mark it `ensure => present`, to
support tarballs which only unpack to a single file (e.g. wal-g).
This commit is contained in:
committed by
Tim Abbott
parent
54b6a83412
commit
f9a39b6703
@@ -29,6 +29,11 @@ define zulip::external_dep(
|
||||
},
|
||||
}
|
||||
|
||||
file { $dir:
|
||||
ensure => present,
|
||||
require => Zulip::Sha256_Tarball_To[$title],
|
||||
}
|
||||
|
||||
unless $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '18.04' {
|
||||
# Puppet 5.5.0 and below make this always-noisy, as they spout out
|
||||
# a notify line about tidying the managed directory above. Skip
|
||||
@@ -39,7 +44,7 @@ define zulip::external_dep(
|
||||
recurse => 1,
|
||||
rmdirs => true,
|
||||
matches => "zulip-${title}-*",
|
||||
require => Zulip::Sha256_Tarball_To[$title],
|
||||
require => File[$dir],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user