From d02354be6c3682c6873daaaed4baa2af762577ed Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 25 Jan 2024 15:44:03 -0500 Subject: [PATCH] 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. --- puppet/zulip_ops/files/statuspage-pusher | 2 +- puppet/zulip_ops/manifests/statuspage.pp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/puppet/zulip_ops/files/statuspage-pusher b/puppet/zulip_ops/files/statuspage-pusher index 19ba1e5865..e7755b3989 100755 --- a/puppet/zulip_ops/files/statuspage-pusher +++ b/puppet/zulip_ops/files/statuspage-pusher @@ -61,7 +61,7 @@ def main() -> None: config_file.read("/etc/zulip/zulip.conf") page_id = config_file.get("statuspage", "page_id") 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.read("/etc/zulip/statuspage.conf") diff --git a/puppet/zulip_ops/manifests/statuspage.pp b/puppet/zulip_ops/manifests/statuspage.pp index 47c417ca2d..ec9084e0c1 100644 --- a/puppet/zulip_ops/manifests/statuspage.pp +++ b/puppet/zulip_ops/manifests/statuspage.pp @@ -13,7 +13,6 @@ class zulip_ops::statuspage { source => 'puppet:///modules/zulip_ops/statuspage-pusher', } - $page_id = zulipsecret('secrets','statuspage_page_id','') file { "${zulip::common::supervisor_conf_dir}/statuspage-pusher.conf": ensure => file, require => [