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

installer: Add support for custom database user and dbname. 

Add support for custom database names and database users, which can be
set with the `--postgresql-database-name` and
`--postgresql-database-user` install script options. If these
parameters aren't provided, then the defaults remain "zulip".

Fixes #17662.

Co-authored-by: Alex Vandiver <alexmv@zulip.com>
This commit is contained in:
Adam Birds 2021-03-28 03:32:51 +01:00 committed by Tim Abbott
parent 4f017614c5
commit 4539899cae
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/lib/install
View File

@ -28,6 +28,10 @@ Options:
install process; used when this command is run once in a highly-controlled install process; used when this command is run once in a highly-controlled
environment to produce an image which is used elsewhere. Uncommon. environment to produce an image which is used elsewhere. Uncommon.
--postgresql-database-name=zulip
Sets the PostgreSQL database name.
--postgresql-database-user=zulip
Sets the PostgreSQL database user.
--postgresql-version=13 --postgresql-version=13
Sets the version of PostgreSQL that will be installed. Sets the version of PostgreSQL that will be installed.
--postgresql-missing-dictionaries --postgresql-missing-dictionaries
@ -47,7 +51,7 @@ EOF
# Shell option parsing. Over time, we'll want to move some of the # Shell option parsing. Over time, we'll want to move some of the
# environment variables below into this self-documenting system. # environment variables below into this self-documenting system.
args="$(getopt -o '' --long help,hostname:,email:,certbot,self-signed-cert,cacert:,postgresql-version:,postgresql-missing-dictionaries,no-init-db,no-overwrite-settings,no-dist-upgrade -n "$0" -- "$@")" args="$(getopt -o '' --long help,hostname:,email:,certbot,self-signed-cert,cacert:,postgresql-database-name:,postgresql-database-user:,postgresql-version:,postgresql-missing-dictionaries,no-init-db,no-overwrite-settings,no-dist-upgrade -n "$0" -- "$@")"
eval "set -- $args" eval "set -- $args"
while true; do while true; do
case "$1" in case "$1" in
@ -80,7 +84,16 @@ while true; do
SELF_SIGNED_CERT=1 SELF_SIGNED_CERT=1
shift shift
;; ;;
--postgresql-database-name)
POSTGRESQL_DATABASE_NAME="$2"
shift
shift
;;
--postgresql-database-user)
POSTGRESQL_DATABASE_USER="$2"
shift
shift
;;
--postgresql-version) --postgresql-version)
POSTGRESQL_VERSION="$2" POSTGRESQL_VERSION="$2"
shift shift
@ -416,6 +429,14 @@ EOF
crudini --del /etc/zulip/zulip.conf postgresql crudini --del /etc/zulip/zulip.conf postgresql
fi fi
if [ -n "$POSTGRESQL_DATABASE_NAME" ]; then
crudini --set /etc/zulip/zulip.conf postgresql database_name "$POSTGRESQL_DATABASE_NAME"
fi
if [ -n "$POSTGRESQL_DATABASE_USER" ]; then
crudini --set /etc/zulip/zulip.conf postgresql database_user "$POSTGRESQL_DATABASE_USER"
fi
# Note: there are four dpkg-query outputs to consider: # Note: there are four dpkg-query outputs to consider:
# #
# root@host# dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null # root@host# dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null