From ec2383dcde3921c5cbd29774fb4c7f8dd4ee8e77 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Thu, 25 Jun 2020 22:38:48 +0000 Subject: [PATCH] installer: Move missing_dictionaries configuration to with other config. It already has been made to explicitly conflict with `--no-overwrite-settings`, so moving it inside the else block is safe. --- scripts/lib/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/lib/install b/scripts/lib/install index 24dde24965..d87f1aa7fd 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -355,6 +355,10 @@ EOF crudini --set /etc/zulip/zulip.conf certbot auto_renew yes fi + if [ -n "$POSTGRES_MISSING_DICTIONARIES" ]; then + crudini --set /etc/zulip/zulip.conf postgresql missing_dictionaries true + fi + "$ZULIP_PATH"/scripts/zulip-puppet-apply --force --noop \ --write-catalog-summary \ --classfile=/var/lib/puppet/classes.txt \ @@ -428,10 +432,6 @@ if [ "$DEPLOYMENT_TYPE" = "dockervoyager" ]; then has_postgres=1 fi -if [ -n "$POSTGRES_MISSING_DICTIONARIES" ]; then - crudini --set /etc/zulip/zulip.conf postgresql missing_dictionaries true -fi - # These server restarting bits should be moveable into puppet-land, ideally if [ "$package_system" = apt ]; then apt-get -y upgrade