paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Tidy old smokescreen binaries.

Browse Source
This commit is contained in:
Alex Vandiver
2021-11-17 10:03:46 -08:00
committed by Tim Abbott
parent 239ac8413e
commit 47e16a5d41
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
puppet/zulip/manifests/profile/smokescreen.pp
View File

@@ -24,13 +24,28 @@ class zulip::profile::smokescreen {
creates => $bin, creates => $bin,
require => [File[$zulip::golang::bin], File[$dir]], require => [File[$zulip::golang::bin], File[$dir]],
} }
file { $bin:
ensure => file,
require => Exec['compile smokescreen'],
}
file { '/usr/local/bin/smokescreen': file { '/usr/local/bin/smokescreen':
ensure => 'link', ensure => 'link',
target => $bin, target => $bin,
require => Exec['compile smokescreen'], require => File[$bin],
notify => Service[supervisor], notify => Service[supervisor],
} }
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 file above. Skip
# on Bionic, which has that old version; they'll get tidied upon
# upgrade to 20.04.
tidy { '/usr/local/bin/smokescreen-*':
path => '/usr/local/bin',
recurse => 1,
matches => 'smokescreen-*',
require => [File[$bin], File['/usr/local/bin/smokescreen']],
}
}
$listen_address = zulipconf('http_proxy', 'listen_address', '127.0.0.1') $listen_address = zulipconf('http_proxy', 'listen_address', '127.0.0.1')
file { "${zulip::common::supervisor_conf_dir}/smokescreen.conf": file { "${zulip::common::supervisor_conf_dir}/smokescreen.conf":