Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Switch from top-level fact variables to facts dict, again. 

These were somehow missed in 57f8b48ff9.
This commit is contained in:
Alex Vandiver 2024-03-25 19:16:16 +00:00 committed by Tim Abbott
parent 7072794871
commit 235e2eefc8
8 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/kandra/manifests/aws_tools.pp
View File

@ -18,7 +18,7 @@ class kandra::aws_tools {
} }
if ! $is_ec2 { if ! $is_ec2 {
if $::os['architecture'] != 'amd64' { if $facts['os']['architecture'] != 'amd64' {
# We would need to build aws_signing_helper from source # We would need to build aws_signing_helper from source
fail('Only amd64 hosts supported on non-EC2') fail('Only amd64 hosts supported on non-EC2')
} }

2
puppet/kandra/manifests/ksplice_uptrack.pp
View File

@ -14,7 +14,7 @@ class kandra::ksplice_uptrack {
mode => '0644', mode => '0644',
content => template('kandra/uptrack/uptrack.conf.erb'), content => template('kandra/uptrack/uptrack.conf.erb'),
} }
$setup_apt_repo_file = "${::zulip_scripts_path}/lib/setup-apt-repo" $setup_apt_repo_file = "${facts['zulip_scripts_path']}/lib/setup-apt-repo"
exec{ 'setup-apt-repo-ksplice': exec{ 'setup-apt-repo-ksplice':
command => "${setup_apt_repo_file} --list ksplice", command => "${setup_apt_repo_file} --list ksplice",
unless => "${setup_apt_repo_file} --list ksplice --verify", unless => "${setup_apt_repo_file} --list ksplice --verify",

4
puppet/kandra/manifests/profile/base.pp
View File

@ -50,7 +50,7 @@ class kandra::profile::base {
mode => '0644', mode => '0644',
source => 'puppet:///modules/kandra/apt/apt.conf.d/50unattended-upgrades', source => 'puppet:///modules/kandra/apt/apt.conf.d/50unattended-upgrades',
} }
if $::os['distro']['release']['major'] == '22.04' { if $facts['os']['distro']['release']['major'] == '22.04' {
file { '/etc/needrestart/conf.d/zulip.conf': file { '/etc/needrestart/conf.d/zulip.conf':
ensure => file, ensure => file,
mode => '0644', mode => '0644',
@ -83,7 +83,7 @@ class kandra::profile::base {
file { '/etc/chrony/chrony.conf': file { '/etc/chrony/chrony.conf':
ensure => file, ensure => file,
mode => '0644', mode => '0644',
source => "puppet:///modules/kandra/chrony-${::os['distro']['release']['major']}.conf", source => "puppet:///modules/kandra/chrony-${facts['os']['distro']['release']['major']}.conf",
require => Package['chrony'], require => Package['chrony'],
notify => Service['chrony'], notify => Service['chrony'],
} }

2
puppet/kandra/manifests/teleport/base.pp
View File

@ -1,7 +1,7 @@
class kandra::teleport::base { class kandra::teleport::base {
include zulip::supervisor include zulip::supervisor
$setup_apt_repo_file = "${::zulip_scripts_path}/lib/setup-apt-repo" $setup_apt_repo_file = "${facts['zulip_scripts_path']}/lib/setup-apt-repo"
exec{ 'setup-apt-repo-teleport': exec{ 'setup-apt-repo-teleport':
command => "${setup_apt_repo_file} --list teleport", command => "${setup_apt_repo_file} --list teleport",
unless => "${setup_apt_repo_file} --list teleport --verify", unless => "${setup_apt_repo_file} --list teleport --verify",

1
puppet/kandra/manifests/teleport/db.pp
View File

@ -5,6 +5,7 @@
class kandra::teleport::db { class kandra::teleport::db {
include kandra::teleport::base include kandra::teleport::base
$fqdn = $facts['networking']['fqdn']
$is_ec2 = zulipconf('machine', 'hosting_provider', 'ec2') == 'ec2' $is_ec2 = zulipconf('machine', 'hosting_provider', 'ec2') == 'ec2'
$join_token = zulipsecret('secrets', 'teleport_join_token', '') $join_token = zulipsecret('secrets', 'teleport_join_token', '')
file { '/etc/teleport_db.yaml': file { '/etc/teleport_db.yaml':

2
puppet/kandra/manifests/vector.pp
View File

@ -5,7 +5,7 @@ class kandra::vector {
$dir = "/srv/zulip-vector-${version}" $dir = "/srv/zulip-vector-${version}"
$bin = "${dir}/bin/vector" $bin = "${dir}/bin/vector"
$arch = $::os['architecture'] ? { $arch = $facts['os']['architecture'] ? {
'amd64' => 'x86_64', 'amd64' => 'x86_64',
'aarch64' => 'aarch64', 'aarch64' => 'aarch64',
} }

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

@ -5,11 +5,12 @@ define zulip::external_dep(
String $sha256 = '', String $sha256 = '',
String $mode = '0755', String $mode = '0755',
) { ) {
$arch = $facts['os']['architecture']
if $sha256 == '' { if $sha256 == '' {
if $zulip::common::versions[$title]['sha256'] =~ Hash { if $zulip::common::versions[$title]['sha256'] =~ Hash {
$sha256_filled = $zulip::common::versions[$title]['sha256'][$::os['architecture']] $sha256_filled = $zulip::common::versions[$title]['sha256'][$arch]
if $sha256_filled == undef { if $sha256_filled == undef {
err("No sha256 found for ${title} for architecture ${facts['os']['architecture']}") err("No sha256 found for ${title} for architecture ${arch}")
fail() fail()
} }
} else { } else {

2
puppet/zulip/manifests/postfix_localmail.pp
View File

@ -2,7 +2,7 @@ class zulip::postfix_localmail {
include zulip::snakeoil include zulip::snakeoil
$postfix_packages = [ 'postfix', ] $postfix_packages = [ 'postfix', ]
$fqdn = $::networking['fqdn'] $fqdn = $facts['networking']['fqdn']
if $fqdn == '' { if $fqdn == '' {
fail('Your system does not have a fully-qualified domain name defined. See hostname(1).') fail('Your system does not have a fully-qualified domain name defined. See hostname(1).')
} }