Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Alex Vandiver 2020-06-25 22:38:48 +00:00 committed by Tim Abbott
parent 9c0fd632bb
commit ec2383dcde
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/lib/install
View File

@ -355,6 +355,10 @@ EOF
crudini --set /etc/zulip/zulip.conf certbot auto_renew yes crudini --set /etc/zulip/zulip.conf certbot auto_renew yes
fi 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 \ "$ZULIP_PATH"/scripts/zulip-puppet-apply --force --noop \
--write-catalog-summary \ --write-catalog-summary \
--classfile=/var/lib/puppet/classes.txt \ --classfile=/var/lib/puppet/classes.txt \
@ -428,10 +432,6 @@ if [ "$DEPLOYMENT_TYPE" = "dockervoyager" ]; then
has_postgres=1 has_postgres=1
fi 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 # These server restarting bits should be moveable into puppet-land, ideally
if [ "$package_system" = apt ]; then if [ "$package_system" = apt ]; then
apt-get -y upgrade apt-get -y upgrade