paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Move slash out of $dir by convention.

Browse Source 
(cherry picked from commit 3c163a7d5e)
This commit is contained in:
Alex Vandiver
2021-12-28 01:08:41 +00:00
committed by Tim Abbott
parent 8dcb1e489d
commit ebd74239a2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/zulip/manifests/camo.pp
View File

@@ -7,14 +7,14 @@ class zulip::camo (String $listen_address = '0.0.0.0') {
}
$version = '2.3.0'
$dir = "/srv/zulip-go-camo-${version}/"
$bin = "${dir}bin/go-camo"
$dir = "/srv/zulip-go-camo-${version}"
$bin = "${dir}/bin/go-camo"
zulip::external_dep { 'go-camo':
version => $version,
url => "https://github.com/cactus/go-camo/releases/download/v${version}/go-camo-${version}.go1171.linux-amd64.tar.gz",
sha256 => '965506e6edb9d974c810519d71e847afb7ca69d1d01ae7d8be6d7a91de669c0c',
tarball_prefix => "go-camo-${version}/",
tarball_prefix => "go-camo-${version}",
bin => 'bin/go-camo',
}

4
puppet/zulip/manifests/external_dep.pp
View File

@@ -6,7 +6,7 @@ define zulip::external_dep(
String $bin = '',
) {
$dir = "/srv/zulip-${title}-${version}/"
$dir = "/srv/zulip-${title}-${version}"
zulip::sha256_tarball_to { $title:
url => $url,
@@ -22,7 +22,7 @@ define zulip::external_dep(
}
if $bin != '' {
file { "${dir}${bin}":
file { "${dir}/${bin}":
ensure => file,
require => File[$dir],
}

6
puppet/zulip/manifests/golang.pp
View File

@@ -3,14 +3,14 @@
class zulip::golang {
$version = '1.17.3'
$dir = "/srv/zulip-golang-${version}/"
$bin = "${dir}bin/go"
$dir = "/srv/zulip-golang-${version}"
$bin = "${dir}/bin/go"
zulip::external_dep { 'golang':
version => $version,
url => "https://golang.org/dl/go${version}.linux-amd64.tar.gz",
sha256 => '550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c',
tarball_prefix => 'go/',
tarball_prefix => 'go',
bin => 'bin/go',
}
}

4
puppet/zulip/manifests/smokescreen.pp
View File

@@ -3,14 +3,14 @@ class zulip::smokescreen {
include zulip::golang
$version = 'dc403015f563eadc556a61870c6ad327688abe88'
$dir = "/srv/zulip-smokescreen-src-${version}/"
$dir = "/srv/zulip-smokescreen-src-${version}"
$bin = "/usr/local/bin/smokescreen-${version}-go-${zulip::golang::version}"
zulip::external_dep { 'smokescreen-src':
version => $version,
url => "https://github.com/stripe/smokescreen/archive/${version}.tar.gz",
sha256 => 'ad4b181d14adcd9425045152b903a343dbbcfcad3c1e7625d2c65d1d50e1959d',
tarball_prefix => "smokescreen-${version}/",
tarball_prefix => "smokescreen-${version}",
}
exec { 'compile smokescreen':