mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
upgrade-postgresql: Use tags to partially-apply configuration.
This uses the same technique used in 840884ec89
, to only apply select
parts of the Puppet configuration. This is more correct, and simpler,
than attempting to chop out some base puppet roles, and hack around
the `purge => true` supervisor.d configuration.
This commit is contained in:
committed by
Tim Abbott
parent
2dc5c6c50e
commit
e13f82f048
@@ -75,7 +75,6 @@ fi
|
||||
cp /etc/zulip/zulip.conf "$TEMP_CONF_DIR"
|
||||
ZULIP_CONF="${TEMP_CONF_DIR}/zulip.conf"
|
||||
crudini --set "$ZULIP_CONF" postgresql version "$UPGRADE_TO"
|
||||
crudini --set "$ZULIP_CONF" machine puppet_classes zulip::profile::base,zulip::postgresql_base
|
||||
|
||||
if [ -f "/usr/share/postgresql/$UPGRADE_FROM/pgroonga_setup.sql.applied" ]; then
|
||||
# This file is intentionally blank, to trigger always running
|
||||
@@ -83,7 +82,7 @@ fi
|
||||
touch "/usr/share/postgresql/$UPGRADE_TO/pgroonga_setup.sql.applied"
|
||||
fi
|
||||
|
||||
FACTER_LEAVE_SUPERVISOR=true "$ZULIP_PATH"/scripts/zulip-puppet-apply -f --config "$ZULIP_CONF"
|
||||
"$ZULIP_PATH"/scripts/zulip-puppet-apply -f --config "$ZULIP_CONF" --tags postgresql_upgrade
|
||||
rm -rf "$TEMP_CONF_DIR"
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user