mirror of https://github.com/zulip/zulip.git
install: We need postgresql.version with zulip::postgresql_client too.
5308fbdeac
split out `zulip::postgresql_client`, and80ef38757a
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.
This commit is contained in:
parent
2585d209c0
commit
22300373d3
|
@ -443,7 +443,7 @@ EOF
|
||||||
|
|
||||||
# We only need the PostgreSQL version setting on database hosts; but
|
# 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.
|
# 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
|
crudini --del /etc/zulip/zulip.conf postgresql
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue