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

puppet: statuspage-pusher uses zulip.conf for page_id. 

This was changed midway through the implementation, from reading it
from `zulip-secrets.conf`, and a couple locations still reference the
secrets path.
This commit is contained in:
Alex Vandiver 2024-01-25 15:44:03 -05:00 committed by Tim Abbott
parent cd565058cd
commit d02354be6c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip_ops/files/statuspage-pusher
View File

@ -61,7 +61,7 @@ def main() -> None:
config_file.read("/etc/zulip/zulip.conf") config_file.read("/etc/zulip/zulip.conf")
page_id = config_file.get("statuspage", "page_id") page_id = config_file.get("statuspage", "page_id")
if page_id is None: if page_id is None:
raise RuntimeError("statuspage_page_id secret is required") raise RuntimeError("statuspage.page_id in zulip.conf is required")
metrics_file = configparser.RawConfigParser() metrics_file = configparser.RawConfigParser()
metrics_file.read("/etc/zulip/statuspage.conf") metrics_file.read("/etc/zulip/statuspage.conf")

1
puppet/zulip_ops/manifests/statuspage.pp
View File

@ -13,7 +13,6 @@ class zulip_ops::statuspage {
source => 'puppet:///modules/zulip_ops/statuspage-pusher', source => 'puppet:///modules/zulip_ops/statuspage-pusher',
} }
$page_id = zulipsecret('secrets','statuspage_page_id','')
file { "${zulip::common::supervisor_conf_dir}/statuspage-pusher.conf": file { "${zulip::common::supervisor_conf_dir}/statuspage-pusher.conf":
ensure => file, ensure => file,
require => [ require => [