paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-11-03 21:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the zulip-puppet/files/createZulipAdmin.sh

Browse Source
This commit is contained in:
Alexander Trost
2015-10-25 16:11:38 +01:00
parent d13cf0c507
commit 23051697cd
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
entrypoint.sh
View File

@@ -362,16 +362,15 @@ bootstrapDatabase() {
echo "(Re)creating database structure ..."
export PGPASSWORD="$DB_PASS"
echo """
CREATE USER zulip;
ALTER ROLE zulip SET search_path TO zulip,public;
CREATE DATABASE zulip OWNER=zulip;
CREATE SCHEMA zulip AUTHORIZATION zulip;
ALTER ROLE $DB_USER SET search_path TO zulip,public;
CREATE DATABASE $DB_NAME OWNER=$DB_USER;
CREATE SCHEMA $DB_NAME AUTHORIZATION $DB_USER;
""" | psql -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_USER" || :
if [ ! -z "$DB_ROOT_USER" ] && [ ! -z "$DB_ROOT_PASS" ]; then
echo "DB_ROOT_USER given, creating extension tsearch_extras"
export PGPASSWORD="$DB_ROOT_PASS"
echo "CREATE EXTENSION tsearch_extras SCHEMA zulip;" | \
psql -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_ROOT_USER" "zulip" || :
echo "CREATE EXTENSION tsearch_extras SCHEMA $DB_NAME;" | \
psql -h "$DB_HOST" -p "$DB_HOST_PORT" -U "$DB_ROOT_USER" "$DB_NAME" || :
unset
fi
unset PGPASSWORD

2
zulip-puppet/files/createZulipAdmin.sh
View File

@@ -18,7 +18,7 @@ except Realm.DoesNotExist:
raise CommandError("Realm/Domain does not exist.")
try:
create_user('$ZULIP_USER_EMAIL', '$ZULIP_USER_PASS', realm, '$ZULIP_USER_FULLNAME', email_to_username(email))
create_user('$ZULIP_USER_EMAIL', '$ZULIP_USER_PASS', realm, '$ZULIP_USER_FULLNAME', email_to_username('$ZULIP_USER_EMAIL'))
except:
pass