From 22300373d3c12458ed67921bf83df225dab85d77 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Wed, 11 Sep 2024 12:17:17 -0400 Subject: [PATCH] install: We need postgresql.version with zulip::postgresql_client too. 5308fbdeacee split out `zulip::postgresql_client`, and 80ef38757aae made it no longer depend on `zulip::postgresql_common`, but directly on `zulipconf('postgresql', 'version', undef)`. However, the installer depended on recognizing `zulip::postgresql_common` in the list of pulled-in classes to know that we needed to keep the `postgresql.version` setting in `/etc/zulip.conf`. Update the installer to also recognize `zulip::postgresql_client` as a class which tells us to keep `postgresql.version` in our settings. --- scripts/lib/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/install b/scripts/lib/install index 4413e1f5f7..a49ad8815f 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -443,7 +443,7 @@ EOF # We only need the PostgreSQL version setting on database hosts; but # we don't know if this is a database host until we have the catalog summary. - if ! has_class "zulip::postgresql_common" || [ "$package_system" != apt ]; then + if (! has_class "zulip::postgresql_common" && ! has_class "zulip::postgresql_client") || [ "$package_system" != apt ]; then crudini --del /etc/zulip/zulip.conf postgresql fi